"fmt"
"io/ioutil"
"net/http"
- "net/url"
"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://fitbit-gfit-sync.appspot.com/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 {
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
}
}
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)
+ signatureGot, err := base64.StdEncoding.DecodeString(rawSig)
if err != nil {
- log.Errorf(ctx, "base64.StdEncoding.DecodeString(%q) = %v", base64Sig, err)
+ log.Errorf(ctx, "base64.StdEncoding.DecodeString(%q) = %v", rawSig, err)
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)
}
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 {
Elevation float64 `json:"elevation"`
Floors int `json:"floors"`
HeartRateZones []HeartRateZone `json:"heartRateZones"`
+ CustomHeartRateZones []HeartRateZone `json:"customHeartRateZones"`
MarginalCalories int `json:"marginalCalories"`
RestingHeartRate int `json:"restingHeartRate"`
Steps int `json:"steps"`
fitbitUserID = "-"
}
- c, err := u.OAuthClient(ctx, "Fitbit", oauth2Config)
+ c, err := u.OAuthClient(ctx, "Fitbit", oauthConfig())
if err != nil {
return nil, err
}
}, nil
}
-func (c *Client) ActivitySummary(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 {
}
defer res.Body.Close()
+ data, _ := ioutil.ReadAll(res.Body)
+ log.Debugf(ctx, "GET %s -> %s", url, data)
+
var summary ActivitySummary
- if err := json.NewDecoder(res.Body).Decode(&summary); err != nil {
+ if err := json.Unmarshal(data, &summary); err != nil {
return nil, err
}
}
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")
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