Read runtime configuration from datastore.

[kraftakt.git] / fitbit / fitbit.go

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index a24f98e..5c967b1 100644 (file)
--- a/fitbit/fitbit.go
+++ b/fitbit/fitbit.go
@@ -9,21 +9,25 @@ import (
        "fmt"
        "io/ioutil"
        "net/http"
-       "net/url"
        "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://fitbit-gfit-sync.appspot.com/fitbit/grant",
-       Scopes:       []string{"activity", "heartrate", "profile"},
+       RedirectURL:  "https://kraftakt.octo.it/fitbit/grant",
+       Scopes: []string{
+               "activity",
+               "heartrate",
+               "profile",
+               "sleep",
+       },
 }
 
 const csrfToken = "@CSRFTOKEN@"
@@ -46,14 +50,9 @@ func ParseToken(ctx context.Context, r *http.Request, u *app.User) error {
 }
 
 func CheckSignature(ctx context.Context, payload []byte, rawSig string) bool {
-       base64Sig, err := url.QueryUnescape(rawSig)
+       signatureGot, err := base64.StdEncoding.DecodeString(rawSig)
        if err != nil {
-               log.Errorf(ctx, "QueryUnescape(%q) = %v", rawSig, err)
-               return false
-       }
-       signatureGot, err := base64.StdEncoding.DecodeString(base64Sig)
-       if err != nil {
-               log.Errorf(ctx, "base64.StdEncoding.DecodeString(%q) = %v", base64Sig, err)
+               log.Errorf(ctx, "base64.StdEncoding.DecodeString(%q) = %v", rawSig, err)
                return false
        }
 
@@ -65,18 +64,21 @@ func CheckSignature(ctx context.Context, payload []byte, rawSig string) bool {
 }
 
 type Activity struct {
-       ActivityID       int     `json:"activityId"`
-       ActivityParentID int     `json:"activityParentId"`
-       Calories         int     `json:"calories"`
-       Description      string  `json:"description"`
-       Distance         float64 `json:"distance"`
-       Duration         int     `json:"duration"`
-       HasStartTime     bool    `json:"hasStartTime"`
-       IsFavorite       bool    `json:"isFavorite"`
-       LogID            int     `json:"logId"`
-       Name             string  `json:"name"`
-       StartTime        string  `json:"startTime"`
-       Steps            int     `json:"steps"`
+       ActivityID         int       `json:"activityId"`
+       ActivityParentID   int       `json:"activityParentId"`
+       ActivityParentName string    `json:"activityParentName"`
+       Calories           int       `json:"calories"`
+       Description        string    `json:"description"`
+       Distance           float64   `json:"distance"`
+       Duration           int       `json:"duration"`
+       HasStartTime       bool      `json:"hasStartTime"`
+       IsFavorite         bool      `json:"isFavorite"`
+       LastModified       time.Time `json:"lastModified"`
+       LogID              int       `json:"logId"`
+       Name               string    `json:"name"`
+       StartTime          string    `json:"startTime"`
+       StartDate          string    `json:"startDate"`
+       Steps              int       `json:"steps"`
 }
 
 type Distance struct {
@@ -109,6 +111,7 @@ type ActivitySummary struct {
                Elevation            float64         `json:"elevation"`
                Floors               int             `json:"floors"`
                HeartRateZones       []HeartRateZone `json:"heartRateZones"`
+               CustomHeartRateZones []HeartRateZone `json:"customHeartRateZones"`
                MarginalCalories     int             `json:"marginalCalories"`
                RestingHeartRate     int             `json:"restingHeartRate"`
                Steps                int             `json:"steps"`
@@ -150,9 +153,9 @@ func NewClient(ctx context.Context, fitbitUserID string, u *app.User) (*Client,
        }, nil
 }
 
-func (c *Client) ActivitySummary(t time.Time) (*ActivitySummary, error) {
+func (c *Client) ActivitySummary(ctx context.Context, date string) (*ActivitySummary, error) {
        url := fmt.Sprintf("https://api.fitbit.com/1/user/%s/activities/date/%s.json",
-               c.fitbitUserID, t.Format("2006-01-02"))
+               c.fitbitUserID, date)
 
        res, err := c.client.Get(url)
        if err != nil {
@@ -160,8 +163,11 @@ func (c *Client) ActivitySummary(t time.Time) (*ActivitySummary, error) {
        }
        defer res.Body.Close()
 
+       data, _ := ioutil.ReadAll(res.Body)
+       log.Debugf(ctx, "GET %s -> %s", url, data)
+
        var summary ActivitySummary
-       if err := json.NewDecoder(res.Body).Decode(&summary); err != nil {
+       if err := json.Unmarshal(data, &summary); err != nil {
                return nil, err
        }
 
@@ -182,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")