From ad911fb5b8a17f238e6158b4f9479c5f8c428bff Mon Sep 17 00:00:00 2001
From: Florian Forster <ff@octo.it>
Date: Fri, 12 Jan 2018 13:57:54 +0100
Subject: [PATCH] Package fitbit: Implement the Profile() method.

---
 fitbit/fitbit.go | 42 +++++++++++++++++++++++++++++++++++++++++-
 gfitsync.go      | 13 ++++++++++---
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/fitbit/fitbit.go b/fitbit/fitbit.go
index 81d4ebc..9f661d6 100644
--- a/fitbit/fitbit.go
+++ b/fitbit/fitbit.go
@@ -23,7 +23,7 @@ var oauth2Config = &oauth2.Config{
 	ClientSecret: "@FITBIT_CLIENT_SECRET@",
 	Endpoint:     oauth2fitbit.Endpoint,
 	RedirectURL:  "https://fitbit-gfit-sync.appspot.com/fitbit/grant",
-	Scopes:       []string{"activity"},
+	Scopes:       []string{"activity", "heartrate", "profile"},
 }
 
 const csrfToken = "@CSRFTOKEN@"
@@ -179,3 +179,43 @@ func (c *Client) Subscribe(ctx context.Context, collection string) error {
 
 	return nil
 }
+
+type Profile struct {
+	Name     string
+	Timezone *time.Location
+}
+
+func (c *Client) Profile(ctx context.Context) (*Profile, error) {
+	res, err := c.client.Get("https://api.fitbit.com/1/user/-/profile.json")
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode >= 400 {
+		data, _ := ioutil.ReadAll(res.Body)
+		log.Errorf(ctx, "reading profile failed: %s", data)
+		return nil, fmt.Errorf("HTTP %d error", res.StatusCode)
+	}
+
+	var data struct {
+		User struct {
+			FullName            string
+			OffsetFromUTCMillis int
+			Timezone            string
+		}
+	}
+	if err := json.NewDecoder(res.Body).Decode(&data); err != nil {
+		return nil, err
+	}
+
+	loc, err := time.LoadLocation(data.User.Timezone)
+	if err != nil {
+		loc = time.FixedZone("Fitbit preference", data.User.OffsetFromUTCMillis/1000)
+	}
+
+	return &Profile{
+		Name:     data.User.FullName,
+		Timezone: loc,
+	}, nil
+}
diff --git a/gfitsync.go b/gfitsync.go
index 22f4c56..b7aa36d 100644
--- a/gfitsync.go
+++ b/gfitsync.go
@@ -219,12 +219,18 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
 		return err
 	}
 
-	tm, err := time.Parse("2006-01-02", s.Date)
+	fitbitClient, err := fitbit.NewClient(ctx, s.OwnerID, u)
 	if err != nil {
 		return err
 	}
 
-	fitbitClient, err := fitbit.NewClient(ctx, s.OwnerID, u)
+	profile, err := fitbitClient.Profile(ctx)
+	if err != nil {
+		return err
+	}
+	log.Debugf(ctx, "profile = %+v", profile)
+
+	tm, err := time.ParseInLocation("2006-01-02", s.Date, profile.Timezone)
 	if err != nil {
 		return err
 	}
@@ -233,7 +239,8 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
 	if err != nil {
 		return err
 	}
-	log.Debugf(ctx, "ActivitySummary for %s = %+v", u.Email, summary)
+	log.Debugf(ctx, "%s (%s) took %d steps on %s",
+		profile.Name, u.Email, summary.Summary.Steps, s.Date)
 
 	gfitClient, err := gfit.NewClient(ctx, u)
 	if err != nil {
-- 
2.11.0