Package fitbit: ActivitySummery(): Log full response.

[kraftakt.git] / fitbit / fitbit.go

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index a24f98e..414ea37 100644 (file)
--- a/fitbit/fitbit.go
+++ b/fitbit/fitbit.go
@@ -9,7 +9,6 @@ import (
        "fmt"
        "io/ioutil"
        "net/http"
-       "net/url"
        "time"
 
        "github.com/octo/gfitsync/app"
@@ -22,7 +21,7 @@ var oauth2Config = &oauth2.Config{
        ClientID:     "@FITBIT_CLIENT_ID@",
        ClientSecret: "@FITBIT_CLIENT_SECRET@",
        Endpoint:     oauth2fitbit.Endpoint,
-       RedirectURL:  "https://fitbit-gfit-sync.appspot.com/fitbit/grant",
+       RedirectURL:  "https://kraftakt.octo.it/fitbit/grant",
        Scopes:       []string{"activity", "heartrate", "profile"},
 }
 
@@ -46,14 +45,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
        }
 
@@ -109,6 +103,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,7 +145,7 @@ 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, t time.Time) (*ActivitySummary, error) {
        url := fmt.Sprintf("https://api.fitbit.com/1/user/%s/activities/date/%s.json",
                c.fitbitUserID, t.Format("2006-01-02"))
 
@@ -160,8 +155,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
        }