X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fitbit%2Ffitbit.go;h=c7a6aa7b184e71cf070c40e9bb6c2128c6960d34;hb=e45460a9cf2134526a755cfa0c8124282f8ccf92;hp=414ea374cd4f34600515e5313f6b1e7a7dfb5d2f;hpb=246b00f84f83100342ee8d57f1faf17ac5d0dd41;p=kraftakt.git

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index 414ea37..c7a6aa7 100644
--- a/fitbit/fitbit.go
+++ b/fitbit/fitbit.go
@@ -11,24 +11,32 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/octo/gfitsync/app"
+	"github.com/octo/kraftakt/app"
 	"golang.org/x/oauth2"
 	oauth2fitbit "golang.org/x/oauth2/fitbit"
 	"google.golang.org/appengine/log"
 )
 
-var oauth2Config = &oauth2.Config{
-	ClientID:     "@FITBIT_CLIENT_ID@",
-	ClientSecret: "@FITBIT_CLIENT_SECRET@",
-	Endpoint:     oauth2fitbit.Endpoint,
-	RedirectURL:  "https://kraftakt.octo.it/fitbit/grant",
-	Scopes:       []string{"activity", "heartrate", "profile"},
+
+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 {
@@ -36,7 +44,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
 	}
@@ -51,7 +59,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)
 
@@ -59,18 +67,21 @@ func CheckSignature(ctx context.Context, payload []byte, rawSig string) bool {
 }
 
 type Activity struct {
-	ActivityID       int     `json:"activityId"`
-	ActivityParentID int     `json:"activityParentId"`
-	Calories         int     `json:"calories"`
-	Description      string  `json:"description"`
-	Distance         float64 `json:"distance"`
-	Duration         int     `json:"duration"`
-	HasStartTime     bool    `json:"hasStartTime"`
-	IsFavorite       bool    `json:"isFavorite"`
-	LogID            int     `json:"logId"`
-	Name             string  `json:"name"`
-	StartTime        string  `json:"startTime"`
-	Steps            int     `json:"steps"`
+	ActivityID         int       `json:"activityId"`
+	ActivityParentID   int       `json:"activityParentId"`
+	ActivityParentName string    `json:"activityParentName"`
+	Calories           int       `json:"calories"`
+	Description        string    `json:"description"`
+	Distance           float64   `json:"distance"`
+	Duration           int       `json:"duration"`
+	HasStartTime       bool      `json:"hasStartTime"`
+	IsFavorite         bool      `json:"isFavorite"`
+	LastModified       time.Time `json:"lastModified"`
+	LogID              int       `json:"logId"`
+	Name               string    `json:"name"`
+	StartTime          string    `json:"startTime"`
+	StartDate          string    `json:"startDate"`
+	Steps              int       `json:"steps"`
 }
 
 type Distance struct {
@@ -133,7 +144,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
 	}
@@ -145,9 +156,9 @@ func NewClient(ctx context.Context, fitbitUserID string, u *app.User) (*Client,
 	}, nil
 }
 
-func (c *Client) ActivitySummary(ctx context.Context, t time.Time) (*ActivitySummary, error) {
+func (c *Client) ActivitySummary(ctx context.Context, date string) (*ActivitySummary, error) {
 	url := fmt.Sprintf("https://api.fitbit.com/1/user/%s/activities/date/%s.json",
-		c.fitbitUserID, t.Format("2006-01-02"))
+		c.fitbitUserID, date)
 
 	res, err := c.client.Get(url)
 	if err != nil {
@@ -180,7 +191,7 @@ func (c *Client) Subscribe(ctx context.Context, collection string) error {
 	}
 	defer res.Body.Close()
 
-	if res.StatusCode >= 400 {
+	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")
@@ -189,6 +200,38 @@ func (c *Client) Subscribe(ctx context.Context, collection string) error {
 	return nil
 }
 
+func (c *Client) Unsubscribe(ctx context.Context) error {
+	subscriberID, err := c.appUser.ID(ctx)
+	if err != nil {
+		return err
+	}
+
+	url := fmt.Sprintf("https://api.fitbit.com/1/user/%s/apiSubscriptions/%s.json",
+		c.fitbitUserID, 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.StatusConflict {
+		data, _ := ioutil.ReadAll(res.Body)
+		log.Errorf(ctx, "creating subscription failed: status %d %q", res.StatusCode, data)
+		return fmt.Errorf("deleting subscription failed")
+	}
+
+	return nil
+}
+
+func (c *Client) DeleteToken(ctx context.Context) error {
+	return c.appUser.DeleteToken(ctx, "Fitbit")
+}
+
 type Profile struct {
 	Name     string
 	Timezone *time.Location