Read runtime configuration from datastore.

[kraftakt.git] / fitbit / fitbit.go

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index 4555e22..5c967b1 100644 (file)
--- 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")