X-Git-Url: https://git.octo.it/?p=kraftakt.git;a=blobdiff_plain;f=kraftakt.go;h=a2b8b137e3d7484328d39c207325888403e008d5;hp=4c6945903e78d5fa376a036c3ee4d291b5d964a4;hb=428a91c3d1adc71f21d761bf9e96e7157b9d51c1;hpb=79cc9f9d92197e7286c166978401f99c679932c2

diff --git a/kraftakt.go b/kraftakt.go
index 4c69459..a2b8b13 100644
--- a/kraftakt.go
+++ b/kraftakt.go
@@ -178,8 +178,11 @@ func fitbitDisconnectHandler(ctx context.Context, w http.ResponseWriter, r *http
 	}
 
 	if err := c.UnsubscribeAll(ctx); err != nil {
-		log.Errorf(ctx, "UnsubscribeAll() = %v", err)
-		return fmt.Errorf("deleting all subscriptions failed")
+		return fmt.Errorf("UnsubscribeAll() = %v", err)
+	}
+
+	if err := c.DeleteToken(ctx); err != nil {
+		return err
 	}
 
 	redirectURL := r.URL
@@ -255,9 +258,13 @@ func fitbitNotifyHandler(ctx context.Context, w http.ResponseWriter, r *http.Req
 	// Fitbit recommendation: "If signature verification fails, you should
 	// respond with a 404"
 	if !fitbit.CheckSignature(ctx, data, r.Header.Get("X-Fitbit-Signature")) {
-		log.Warningf(ctx, "signature mismatch")
-		w.WriteHeader(http.StatusNotFound)
-		return nil
+		/*
+			log.Errorf(ctx, "signature mismatch")
+			w.WriteHeader(http.StatusNotFound)
+			return nil
+		*/
+	} else {
+		log.Warningf(ctx, "TODO(octo): re-enable signature checking, see https://community.fitbit.com/t5/Web-API-Development/Push-notification-signatures-are-currently-invalid/m-p/2496159")
 	}
 
 	if err := delayedHandleNotifications.Call(ctx, data); err != nil {
@@ -282,22 +289,37 @@ func handleNotifications(ctx context.Context, payload []byte) error {
 		return err
 	}
 
+	wg := &sync.WaitGroup{}
+
 	for _, s := range subscriptions {
-		if s.CollectionType != "activities" {
+		switch s.CollectionType {
+		case "activities":
+			wg.Add(1)
+			go func(s fitbit.Subscription) {
+				defer wg.Done()
+				if err := activitiesNotification(ctx, &s); err != nil {
+					log.Warningf(ctx, "activitiesNotification() = %v", err)
+				}
+			}(s) // copies s
+		case "sleep":
+			wg.Add(1)
+			go func(s fitbit.Subscription) {
+				defer wg.Done()
+				if err := sleepNotification(ctx, &s); err != nil {
+					log.Warningf(ctx, "sleepNotification() = %v", err)
+				}
+			}(s) // copies s
+		default:
 			log.Warningf(ctx, "ignoring collection type %q", s.CollectionType)
-			continue
-		}
 
-		if err := handleNotification(ctx, &s); err != nil {
-			log.Errorf(ctx, "handleNotification() = %v", err)
-			continue
 		}
 	}
 
+	wg.Wait()
 	return nil
 }
 
-func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
+func activitiesNotification(ctx context.Context, s *fitbit.Subscription) error {
 	u, err := fitbit.UserFromSubscriberID(ctx, s.SubscriptionID)
 	if err != nil {
 		return err
@@ -415,7 +437,7 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
 			activities = append(activities, gfit.Activity{
 				Start: startTime,
 				End:   endTime,
-				Type:  gfit.ParseFitbitActivity(a.Name),
+				Type:  a.Name,
 			})
 		}
 		if err := gfitClient.SetActivities(ctx, activities, tm); err != nil {
@@ -431,3 +453,74 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
 	}
 	return nil
 }
+
+func sleepNotification(ctx context.Context, s *fitbit.Subscription) error {
+	u, err := fitbit.UserFromSubscriberID(ctx, s.SubscriptionID)
+	if err != nil {
+		return err
+	}
+
+	var (
+		wg         = &sync.WaitGroup{}
+		gfitClient *gfit.Client
+		gfitErr    error
+	)
+
+	wg.Add(1)
+	go func() {
+		gfitClient, gfitErr = gfit.NewClient(ctx, u)
+		wg.Done()
+	}()
+
+	fitbitClient, err := fitbit.NewClient(ctx, s.OwnerID, u)
+	if err != nil {
+		return err
+	}
+
+	profile, err := fitbitClient.Profile(ctx)
+	if err != nil {
+		return err
+	}
+
+	tm, err := time.ParseInLocation("2006-01-02", s.Date, profile.Timezone)
+	if err != nil {
+		return err
+	}
+
+	sleep, err := fitbitClient.Sleep(ctx, tm)
+	if err != nil {
+		return err
+	}
+
+	var activities []gfit.Activity
+	for _, stg := range sleep.Stages {
+		a := gfit.Activity{
+			Start: stg.StartTime,
+			End:   stg.EndTime,
+		}
+		switch stg.Level {
+		case fitbit.SleepLevelDeep:
+			a.Type = "Deep sleep"
+		case fitbit.SleepLevelLight:
+			a.Type = "Light sleep"
+		case fitbit.SleepLevelREM:
+			a.Type = "REM sleep"
+		case fitbit.SleepLevelWake:
+			a.Type = "Awake (during sleep cycle)"
+		default:
+			log.Warningf(ctx, "unexpected sleep level %v", stg.Level)
+			continue
+		}
+	}
+
+	wg.Wait()
+	if gfitErr != nil {
+		return gfitErr
+	}
+
+	if err := gfitClient.SetActivities(ctx, activities, tm); err != nil {
+		return fmt.Errorf("SetActivities() = %v", err)
+	}
+
+	return nil
+}