X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fitbit%2Ffitbit.go;h=5c967b1df82e37be0a48f147671f26fcc2c55ffd;hb=efc1f271711fbbbf06543c1d4883f377019f8c84;hp=4555e2267dbb013c5364a71b841fa20414cb6931;hpb=6c7b039b319152555c9529d8d5a2c2483cf65887;p=kraftakt.git

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index 4555e22..5c967b1 100644
--- a/fitbit/fitbit.go
+++ b/fitbit/fitbit.go
@@ -11,15 +11,15 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/octo/gfitsync/app"
+	"github.com/octo/kraftakt/app"
 	"golang.org/x/oauth2"
 	oauth2fitbit "golang.org/x/oauth2/fitbit"
 	"google.golang.org/appengine/log"
 )
 
 var oauth2Config = &oauth2.Config{
-	ClientID:     "@FITBIT_CLIENT_ID@",
-	ClientSecret: "@FITBIT_CLIENT_SECRET@",
+	ClientID:     app.Config.FitbitClientID,
+	ClientSecret: app.Config.FitbitClientSecret,
 	Endpoint:     oauth2fitbit.Endpoint,
 	RedirectURL:  "https://kraftakt.octo.it/fitbit/grant",
 	Scopes: []string{
@@ -188,7 +188,7 @@ func (c *Client) Subscribe(ctx context.Context, collection string) error {
 	}
 	defer res.Body.Close()
 
-	if res.StatusCode >= 400 {
+	if res.StatusCode >= 400 && res.StatusCode != http.StatusConflict {
 		data, _ := ioutil.ReadAll(res.Body)
 		log.Errorf(ctx, "creating subscription failed: status %d %q", res.StatusCode, data)
 		return fmt.Errorf("creating subscription failed")