X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fitbit%2Ffitbit.go;h=36a6e87b386f49c60eb789f81172953a5617b0bb;hb=92093b34c3443824b0ce6de91acc86469636ce2f;hp=5c967b1df82e37be0a48f147671f26fcc2c55ffd;hpb=efc1f271711fbbbf06543c1d4883f377019f8c84;p=kraftakt.git diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go index 5c967b1..36a6e87 100644 --- a/fitbit/fitbit.go +++ b/fitbit/fitbit.go @@ -17,23 +17,25 @@ import ( "google.golang.org/appengine/log" ) -var oauth2Config = &oauth2.Config{ - ClientID: app.Config.FitbitClientID, - ClientSecret: app.Config.FitbitClientSecret, - Endpoint: oauth2fitbit.Endpoint, - RedirectURL: "https://kraftakt.octo.it/fitbit/grant", - Scopes: []string{ - "activity", - "heartrate", - "profile", - "sleep", - }, +func oauthConfig() *oauth2.Config { + return &oauth2.Config{ + ClientID: app.Config.FitbitClientID, + ClientSecret: app.Config.FitbitClientSecret, + Endpoint: oauth2fitbit.Endpoint, + RedirectURL: "https://kraftakt.octo.it/fitbit/grant", + Scopes: []string{ + "activity", + "heartrate", + "profile", + "sleep", + }, + } } const csrfToken = "@CSRFTOKEN@" func AuthURL() string { - return oauth2Config.AuthCodeURL(csrfToken, oauth2.AccessTypeOffline) + return oauthConfig().AuthCodeURL(csrfToken, oauth2.AccessTypeOffline) } func ParseToken(ctx context.Context, r *http.Request, u *app.User) error { @@ -41,7 +43,7 @@ func ParseToken(ctx context.Context, r *http.Request, u *app.User) error { return fmt.Errorf("invalid state parameter: %q", state) } - tok, err := oauth2Config.Exchange(ctx, r.FormValue("code")) + tok, err := oauthConfig().Exchange(ctx, r.FormValue("code")) if err != nil { return err } @@ -56,7 +58,7 @@ func CheckSignature(ctx context.Context, payload []byte, rawSig string) bool { return false } - mac := hmac.New(sha1.New, []byte(oauth2Config.ClientSecret+"&")) + mac := hmac.New(sha1.New, []byte(oauthConfig().ClientSecret+"&")) mac.Write(payload) signatureWant := mac.Sum(nil) @@ -141,7 +143,7 @@ func NewClient(ctx context.Context, fitbitUserID string, u *app.User) (*Client, fitbitUserID = "-" } - c, err := u.OAuthClient(ctx, "Fitbit", oauth2Config) + c, err := u.OAuthClient(ctx, "Fitbit", oauthConfig()) if err != nil { return nil, err } @@ -190,13 +192,45 @@ func (c *Client) Subscribe(ctx context.Context, collection string) error { 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") + log.Errorf(ctx, "creating %q subscription failed: status %d %q", collection, res.StatusCode, data) + return fmt.Errorf("creating %q subscription failed", collection) } return nil } +func (c *Client) Unsubscribe(ctx context.Context, collection string) error { + subscriberID, err := c.appUser.ID(ctx) + if err != nil { + return err + } + + url := fmt.Sprintf("https://api.fitbit.com/1/user/%s/%s/apiSubscriptions/%s.json", + c.fitbitUserID, collection, subscriberID) + req, err := http.NewRequest(http.MethodDelete, url, nil) + if err != nil { + return err + } + + res, err := c.client.Do(req.WithContext(ctx)) + if err != nil { + return err + } + defer res.Body.Close() + + if res.StatusCode >= 400 && res.StatusCode != http.StatusNotFound { + data, _ := ioutil.ReadAll(res.Body) + log.Errorf(ctx, "deleting %q subscription failed: status %d %q", collection, res.StatusCode, data) + return fmt.Errorf("deleting %q subscription failed", collection) + } + + return nil +} + +func (c *Client) DeleteToken(ctx context.Context) error { + return c.appUser.DeleteToken(ctx, "Fitbit") +} + type Profile struct { Name string Timezone *time.Location