Hello %s
\n", u.Email) + fmt.Fprint(w, "Fitbit: ") + if haveToken { + fmt.Fprint(w, `Authorized`) + } else { + fmt.Fprint(w, `Not authorized (Authorize)`) + } + fmt.Fprintln(w, "
") + fmt.Fprintln(w, "") // TODO(octo): print summary to user return nil @@ -126,7 +141,7 @@ func setupHandler(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, url, http.StatusTemporaryRedirect) } -func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *user.User) error { +func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, rootKey *datastore.Key) error { if state := r.FormValue("state"); state != csrfToken { return fmt.Errorf("invalid state parameter: %q", state) } @@ -136,22 +151,39 @@ func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ return err } - key := datastore.NewKey(ctx, "Token", "Fitbit", 0, RootKey(ctx, u)) + key := datastore.NewKey(ctx, "Token", "Fitbit", 0, rootKey) if _, err := datastore.Put(ctx, key, tok); err != nil { return err } - c := oauthConfig.Client(ctx, tok) + var u User + if err := datastore.Get(ctx, rootKey, &u); err != nil { + return err + } + // create a subscription - url := fmt.Sprintf("https://api.fitbit.com/1/user/-/activities/apiSubscriptions/%s.json", - RootKey(ctx, u).Encode()) + url := fmt.Sprintf("https://api.fitbit.com/1/user/-/activities/apiSubscriptions/%s.json", u.ID) res, err := c.Post(url, "", nil) if err != nil { return err } defer res.Body.Close() + if res.StatusCode == http.StatusConflict { + var n fitbitSubscription + if err := json.NewDecoder(res.Body).Decode(&n); err != nil { + return err + } + log.Warningf(ctx, "conflict with existing subscription %v", n) + } + + if res.StatusCode >= 400 { + data, _ := ioutil.ReadAll(res.Body) + log.Errorf(ctx, "creating subscription failed: status %d %q", res.StatusCode, data) + return fmt.Errorf("creating subscription failed") + } + redirectURL := r.URL redirectURL.Path = "/" redirectURL.RawQuery = "" @@ -160,7 +192,7 @@ func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ return nil } -type fitbitNotification struct { +type fitbitSubscription struct { CollectionType string `json:"collectionType"` Date string `json:"date"` OwnerID string `json:"ownerId"` @@ -168,19 +200,20 @@ type fitbitNotification struct { SubscriptionID string `json:"subscriptionId"` } -func (n *fitbitNotification) URLValues() url.Values { +func (s *fitbitSubscription) URLValues() url.Values { return url.Values{ - "CollectionType": []string{n.CollectionType}, - "Date": []string{n.Date}, - "OwnerID": []string{n.OwnerID}, - "OwnerType": []string{n.OwnerType}, - "SubscriptionID": []string{n.SubscriptionID}, + "CollectionType": []string{s.CollectionType}, + "Date": []string{s.Date}, + "OwnerID": []string{s.OwnerID}, + "OwnerType": []string{s.OwnerType}, + "SubscriptionID": []string{s.SubscriptionID}, } } -func (n *fitbitNotification) URL() string { +func (s *fitbitSubscription) URL() string { + // daily summary: GET https://api.fitbit.com/1/user/[user-id]/activities/date/[date].json return fmt.Sprintf("https://api.fitbit.com/1/user/%s/%s/date/%s.json", - n.OwnerID, n.CollectionType, n.Date) + s.OwnerID, s.CollectionType, s.Date) } func checkSignature(ctx context.Context, payload []byte, rawSig string) bool { @@ -246,17 +279,17 @@ func fitbitNotifyHandler(ctx context.Context, w http.ResponseWriter, r *http.Req // handleNotifications parses fitbit notifications and requests the individual // activities from Fitbit. It is executed asynchronously via the delay package. func handleNotifications(ctx context.Context, payload []byte) error { - var notifications []fitbitNotification - if err := json.Unmarshal(payload, notifications); err != nil { + var subscriptions []fitbitSubscription + if err := json.Unmarshal(payload, &subscriptions); err != nil { return err } - for _, n := range notifications { - if n.CollectionType != "activities" { + for _, s := range subscriptions { + if s.CollectionType != "activities" { continue } - if err := handleNotification(ctx, &n); err != nil { + if err := handleNotification(ctx, &s); err != nil { log.Errorf(ctx, "handleNotification() = %v", err) continue } @@ -265,11 +298,17 @@ func handleNotifications(ctx context.Context, payload []byte) error { return nil } -func handleNotification(ctx context.Context, n *fitbitNotification) error { - rootKey, err := datastore.DecodeKey(n.SubscriptionID) +func handleNotification(ctx context.Context, s *fitbitSubscription) error { + q := datastore.NewQuery("User").Filter("ID=", s.SubscriptionID).KeysOnly() + keys, err := q.GetAll(ctx, nil) if err != nil { - return err + return fmt.Errorf("datastore.Query.GetAll(): %v", err) } + if len(keys) != 1 { + return fmt.Errorf("len(keys) = %d, want 1", len(keys)) + } + + rootKey := keys[0] key := datastore.NewKey(ctx, "Token", "Fitbit", 0, rootKey) var tok oauth2.Token @@ -277,12 +316,18 @@ func handleNotification(ctx context.Context, n *fitbitNotification) error { return err } - c := oauthConfig.Client(ctx, &tok) - res, err := c.Get(n.URL()) + c := fitbit.NewClient(ctx, s.OwnerID, &tok) + + t, err := time.Parse("2006-01-02", s.Date) + if err != nil { + return err + } + + summary, err := c.ActivitySummary(t) if err != nil { return err } - log.Infof(ctx, "GET %s = %v", n.URL(), res) + log.Debugf(ctx, "ActivitySummary() = %v", summary) return nil }