X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gfitsync.go;h=eb3c953d2b405272a7f4f2a89609ce85254caf86;hb=19a78ce4b915845cf1232c84f17074982f27a4ce;hp=fe8049cd8bc17e09639bba148a85b40a52e34b8c;hpb=2a96ce53ec33a7fbd6d5054671ed2dfcc0ff379e;p=kraftakt.git diff --git a/gfitsync.go b/gfitsync.go index fe8049c..eb3c953 100644 --- a/gfitsync.go +++ b/gfitsync.go @@ -2,21 +2,16 @@ package gfitsync import ( "context" - "crypto/hmac" - "crypto/sha1" - "encoding/base64" "encoding/json" "fmt" "io/ioutil" "net/http" - "net/url" + "sync" "time" - "github.com/google/uuid" + "github.com/octo/gfitsync/app" "github.com/octo/gfitsync/fitbit" - legacy_context "golang.org/x/net/context" - "golang.org/x/oauth2" - oauth2fitbit "golang.org/x/oauth2/fitbit" + "github.com/octo/gfitsync/gfit" "google.golang.org/appengine" "google.golang.org/appengine/datastore" "google.golang.org/appengine/delay" @@ -24,25 +19,14 @@ import ( "google.golang.org/appengine/user" ) -const csrfToken = "@CSRFTOKEN@" - -// var delayedHandleNotifications = delay.Func("handleNotifications", func(ctx legacy_context.Context, payload []byte) error { -// return handleNotifications(ctx, payload) -// }) var delayedHandleNotifications = delay.Func("handleNotifications", handleNotifications) -var oauthConfig = &oauth2.Config{ - ClientID: "@FITBIT_CLIENT_ID@", - ClientSecret: "@FITBIT_CLIENT_SECRET@", - Endpoint: oauth2fitbit.Endpoint, - RedirectURL: "https://fitbit-gfit-sync.appspot.com/fitbit/grant", // TODO(octo): make full URL - Scopes: []string{"activity"}, -} - func init() { - http.HandleFunc("/setup", setupHandler) + http.HandleFunc("/fitbit/setup", fitbitSetupHandler) http.Handle("/fitbit/grant", AuthenticatedHandler(fitbitGrantHandler)) http.Handle("/fitbit/notify", ContextHandler(fitbitNotifyHandler)) + http.HandleFunc("/google/setup", googleSetupHandler) + http.Handle("/google/grant", AuthenticatedHandler(googleGrantHandler)) http.Handle("/", AuthenticatedHandler(indexHandler)) } @@ -58,17 +42,13 @@ func (hndl ContextHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } -type AuthenticatedHandler func(context.Context, http.ResponseWriter, *http.Request, *datastore.Key) error - -type User struct { - ID string -} +type AuthenticatedHandler func(context.Context, http.ResponseWriter, *http.Request, *app.User) error func (hndl AuthenticatedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { ctx := appengine.NewContext(r) - u := user.Current(ctx) - if u == nil { + gaeUser := user.Current(ctx) + if gaeUser == nil { url, err := user.LoginURL(ctx, r.URL.String()) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) @@ -78,110 +58,76 @@ func (hndl AuthenticatedHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques return } - err := datastore.RunInTransaction(ctx, func(ctx legacy_context.Context) error { - key := datastore.NewKey(ctx, "User", u.Email, 0, nil) - - if err := datastore.Get(ctx, key, &User{}); err != datastore.ErrNoSuchEntity { - return err // may be nil - } - - _, err := datastore.Put(ctx, key, &User{ - ID: uuid.New().String(), - }) - return err - }, nil) + u, err := app.NewUser(ctx, gaeUser.Email) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - rootKey := datastore.NewKey(ctx, "User", u.Email, 0, nil) - if err := hndl(ctx, w, r, rootKey); err != nil { + if err := hndl(ctx, w, r, u); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } } -func indexHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, rootKey *datastore.Key) error { - var ( - tok oauth2.Token - haveToken bool - ) - - key := datastore.NewKey(ctx, "Token", "Fitbit", 0, rootKey) - err := datastore.Get(ctx, key, &tok) +func indexHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error { + _, err := u.Token(ctx, "Fitbit") if err != nil && err != datastore.ErrNoSuchEntity { return err } - if err == nil { - haveToken = true + haveFitbitToken := err == nil + + _, err = u.Token(ctx, "Google") + if err != nil && err != datastore.ErrNoSuchEntity { + return err } + haveGoogleToken := err == nil - u := user.Current(ctx) + fmt.Fprintln(w, "Kraftakt") + fmt.Fprintln(w, "

Kraftakt

") - // fmt.Fprintf(w, "u = %v, tok = %v, haveToken = %v\n", u, tok, haveToken) - fmt.Fprintln(w, "

Fitbit to Google Fit sync

") + fmt.Fprintln(w, "

Kraftakt copies your Fitbit data to Google Fit, seconds after you sync.

") + + fmt.Fprintf(w, "

Hello %s

\n", user.Current(ctx).Email) + 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) - http.Redirect(w, r, url, http.StatusTemporaryRedirect) +func fitbitSetupHandler(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, fitbit.AuthURL(), http.StatusTemporaryRedirect) } -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) - } - - tok, err := oauthConfig.Exchange(ctx, r.FormValue("code")) - if err != nil { - return err - } - - 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 { +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 } - - // create a subscription - url := fmt.Sprintf("https://api.fitbit.com/1/user/-/activities/apiSubscriptions/%s.json", u.ID) - res, err := c.Post(url, "", nil) + c, err := fitbit.NewClient(ctx, "-", u) 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") + if err := c.Subscribe(ctx, "activities"); err != nil { + return fmt.Errorf("c.Subscribe() = %v", err) } redirectURL := r.URL @@ -192,47 +138,21 @@ func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ return nil } -type fitbitSubscription struct { - CollectionType string `json:"collectionType"` - Date string `json:"date"` - OwnerID string `json:"ownerId"` - OwnerType string `json:"ownerType"` - SubscriptionID string `json:"subscriptionId"` -} - -func (s *fitbitSubscription) URLValues() url.Values { - return url.Values{ - "CollectionType": []string{s.CollectionType}, - "Date": []string{s.Date}, - "OwnerID": []string{s.OwnerID}, - "OwnerType": []string{s.OwnerType}, - "SubscriptionID": []string{s.SubscriptionID}, - } -} - -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", - s.OwnerID, s.CollectionType, s.Date) +func googleSetupHandler(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, gfit.AuthURL(), http.StatusTemporaryRedirect) } -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 +func googleGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error { + if err := gfit.ParseToken(ctx, r, u); err != nil { + return err } - mac := hmac.New(sha1.New, []byte(oauthConfig.ClientSecret+"&")) - mac.Write(payload) - signatureWant := mac.Sum(nil) - - return hmac.Equal(signatureGot, signatureWant) + redirectURL := r.URL + redirectURL.Path = "/" + redirectURL.RawQuery = "" + redirectURL.Fragment = "" + http.Redirect(w, r, redirectURL.String(), http.StatusTemporaryRedirect) + return nil } // fitbitNotifyHandler is called by Fitbit whenever there are updates to a @@ -263,7 +183,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 } @@ -279,7 +199,7 @@ 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 subscriptions []fitbitSubscription + var subscriptions []fitbit.Subscription if err := json.Unmarshal(payload, &subscriptions); err != nil { return err } @@ -298,36 +218,135 @@ func handleNotifications(ctx context.Context, payload []byte) error { return nil } -func handleNotification(ctx context.Context, s *fitbitSubscription) error { - q := datastore.NewQuery("User").Filter("ID=", s.SubscriptionID).KeysOnly() - keys, err := q.GetAll(ctx, nil) +func handleNotification(ctx context.Context, s *fitbit.Subscription) error { + u, err := app.UserByID(ctx, s.SubscriptionID) if err != nil { - return fmt.Errorf("datastore.Query.GetAll(): %v", err) - } - if len(keys) != 1 { - return fmt.Errorf("len(keys) = %d, want 1", len(keys)) + return err } - rootKey := keys[0] - key := datastore.NewKey(ctx, "Token", "Fitbit", 0, rootKey) - - var tok oauth2.Token - if err := datastore.Get(ctx, key, &tok); err != nil { + fitbitClient, err := fitbit.NewClient(ctx, s.OwnerID, u) + if err != nil { return err } - c := fitbit.NewClient(ctx, s.OwnerID, &tok) + var ( + wg = &sync.WaitGroup{} + errs appengine.MultiError + summary *fitbit.ActivitySummary + profile *fitbit.Profile + ) + + wg.Add(1) + go func() { + var err error + summary, err = fitbitClient.ActivitySummary(ctx, s.Date) + if err != nil { + errs = append(errs, fmt.Errorf("fitbitClient.ActivitySummary(%q) = %v", s.Date, err)) + } + wg.Done() + }() - t, err := time.Parse("2006-01-02", s.Date) + wg.Add(1) + go func() { + var err error + profile, err = fitbitClient.Profile(ctx) + if err != nil { + errs = append(errs, fmt.Errorf("fitbitClient.Profile(%q) = %v", s.Date, err)) + } + wg.Done() + }() + + wg.Wait() + if len(errs) != 0 { + return errs + } + + tm, err := time.ParseInLocation("2006-01-02", s.Date, profile.Timezone) if err != nil { return err } - summary, err := c.ActivitySummary(t) + log.Debugf(ctx, "%s (%s) took %d steps on %s", + profile.Name, u.Email, summary.Summary.Steps, tm) + + gfitClient, err := gfit.NewClient(ctx, u) if err != nil { return err } - log.Debugf(ctx, "ActivitySummary() = %v", summary) + wg.Add(1) + go func() { + if err := gfitClient.SetSteps(ctx, summary.Summary.Steps, tm); err != nil { + errs = append(errs, fmt.Errorf("gfitClient.SetSteps(%d) = %v", summary.Summary.Steps, err)) + } + wg.Done() + }() + + wg.Add(1) + go func() { + if err := gfitClient.SetCalories(ctx, summary.Summary.CaloriesOut, tm); err != nil { + errs = append(errs, fmt.Errorf("gfitClient.SetCalories(%d) = %v", summary.Summary.CaloriesOut, err)) + } + wg.Done() + }() + + wg.Add(1) + go func() { + var distanceMeters float64 + for _, d := range summary.Summary.Distances { + if d.Activity != "total" { + continue + } + distanceMeters = 1000.0 * d.Distance + break + } + if err := gfitClient.SetDistance(ctx, distanceMeters, tm); err != nil { + errs = append(errs, fmt.Errorf("gfitClient.SetDistance(%d) = %v", distanceMeters, err)) + } + wg.Done() + }() + + wg.Add(1) + go func() { + if err := gfitClient.SetHeartRate(ctx, summary.Summary.HeartRateZones, summary.Summary.RestingHeartRate, tm); err != nil { + errs = append(errs, fmt.Errorf("gfitClient.SetHeartRate() = %v", err)) + } + wg.Done() + }() + + wg.Add(1) + go func() { + defer wg.Done() + + var activities []gfit.Activity + for _, a := range summary.Activities { + if !a.HasStartTime { + continue + } + + startTime, err := time.ParseInLocation("2006-01-02T15:04:05", a.StartDate+"T"+a.StartTime, profile.Timezone) + if err != nil { + errs = append(errs, fmt.Errorf("gfitClient.SetActivities() = %v", err)) + return + } + endTime := startTime.Add(time.Duration(a.Duration) * time.Millisecond) + + activities = append(activities, gfit.Activity{ + Start: startTime, + End: endTime, + Type: gfit.ParseFitbitActivity(a.Name), + }) + } + if err := gfitClient.SetActivities(ctx, activities, tm); err != nil { + errs = append(errs, fmt.Errorf("gfitClient.SetActivities() = %v", err)) + return + } + }() + + wg.Wait() + + if len(errs) != 0 { + return errs + } return nil }