Hello %s
\n", u.Email) + fmt.Fprintf(w, "Hello %s
\n", user.Current(ctx).Email) fmt.Fprint(w, "Fitbit: ") if haveToken { fmt.Fprint(w, `Authorized`) @@ -128,45 +88,25 @@ func indexHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u fmt.Fprintln(w, "
") fmt.Fprintln(w, "") - // TODO(octo): print summary to user return nil } func setupHandler(w http.ResponseWriter, r *http.Request) { - url := oauthConfig.AuthCodeURL(csrfToken, oauth2.AccessTypeOffline) + url := fitbit.AuthURL() http.Redirect(w, r, url, http.StatusTemporaryRedirect) } -func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *user.User) error { - if state := r.FormValue("state"); state != csrfToken { - return fmt.Errorf("invalid state parameter: %q", state) - } - - tok, err := oauthConfig.Exchange(ctx, r.FormValue("code")) - if err != nil { +func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error { + if err := fitbit.ParseToken(ctx, r, u); err != nil { return err } - - key := datastore.NewKey(ctx, "Token", "Fitbit", 0, RootKey(ctx, u)) - if _, err := datastore.Put(ctx, key, tok); err != nil { - return err - } - - c := oauthConfig.Client(ctx, tok) - - // create a subscription - url := fmt.Sprintf("https://api.fitbit.com/1/user/-/activities/apiSubscriptions/%s.json", - RootKey(ctx, u).Encode()) - res, err := c.Post(url, "", nil) + c, err := fitbit.NewClient(ctx, "-", u) if err != nil { return err } - defer res.Body.Close() - if res.StatusCode >= 400 { - data, _ := ioutil.ReadAll(r.Body) - log.Errorf(ctx, "creating subscription failed: status %d %q", res.StatusCode, data) - return fmt.Errorf("creating subscription failed") + if err := c.Subscribe(ctx, "activities"); err != nil { + return fmt.Errorf("c.Subscribe() = %v", err) } redirectURL := r.URL @@ -177,48 +117,6 @@ func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ return nil } -type fitbitNotification struct { - CollectionType string `json:"collectionType"` - Date string `json:"date"` - OwnerID string `json:"ownerId"` - OwnerType string `json:"ownerType"` - SubscriptionID string `json:"subscriptionId"` -} - -func (n *fitbitNotification) 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}, - } -} - -func (n *fitbitNotification) URL() string { - return fmt.Sprintf("https://api.fitbit.com/1/user/%s/%s/date/%s.json", - n.OwnerID, n.CollectionType, n.Date) -} - -func checkSignature(ctx context.Context, payload []byte, rawSig string) bool { - base64Sig, err := url.QueryUnescape(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) - return false - } - - mac := hmac.New(sha1.New, []byte(oauthConfig.ClientSecret+"&")) - mac.Write(payload) - signatureWant := mac.Sum(nil) - - return hmac.Equal(signatureGot, signatureWant) -} - // fitbitNotifyHandler is called by Fitbit whenever there are updates to a // subscription. It verifies the payload, splits it into individual // notifications and adds it to the taskqueue service. @@ -247,7 +145,7 @@ func fitbitNotifyHandler(ctx context.Context, w http.ResponseWriter, r *http.Req // Fitbit recommendation: "If signature verification fails, you should // respond with a 404" - if !checkSignature(ctx, data, r.Header.Get("X-Fitbit-Signature")) { + if !fitbit.CheckSignature(ctx, data, r.Header.Get("X-Fitbit-Signature")) { w.WriteHeader(http.StatusNotFound) return nil } @@ -263,17 +161,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 []fitbit.Subscription + 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 } @@ -282,24 +180,26 @@ 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 *fitbit.Subscription) error { + u, err := app.UserByID(ctx, s.SubscriptionID) + if err != nil { + return err + } + c, err := fitbit.NewClient(ctx, s.OwnerID, u) if err != nil { return err } - key := datastore.NewKey(ctx, "Token", "Fitbit", 0, rootKey) - var tok oauth2.Token - if err := datastore.Get(ctx, key, &tok); err != nil { + tm, err := time.Parse("2006-01-02", s.Date) + if err != nil { return err } - c := oauthConfig.Client(ctx, &tok) - res, err := c.Get(n.URL()) + summary, err := c.ActivitySummary(tm) if err != nil { return err } - log.Infof(ctx, "GET %s = %v", n.URL(), res) + log.Debugf(ctx, "ActivitySummary(%q) = %+v", s.OwnerID, summary) return nil }