Package fitbit: Implement UnsubscribeAll() and ListSubscriptions().

[kraftakt.git] / kraftakt.go

diff --git a/kraftakt.go b/kraftakt.go
index f6b3d9c..61a576e 100644 (file)
--- a/kraftakt.go
+++ b/kraftakt.go
@@ -137,12 +137,7 @@ func loginHandler(_ context.Context, w http.ResponseWriter, r *http.Request, _ *
 }
 
 func fitbitConnectHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error {
-       c, err := fitbit.NewClient(ctx, "", u)
-       if err != nil {
-               return err
-       }
-
-       http.Redirect(w, r, c.AuthURL(ctx), http.StatusTemporaryRedirect)
+       http.Redirect(w, r, fitbit.AuthURL(ctx, u), http.StatusTemporaryRedirect)
        return nil
 }
 
@@ -176,21 +171,9 @@ func fitbitDisconnectHandler(ctx context.Context, w http.ResponseWriter, r *http
                return err
        }
 
-       var errs appengine.MultiError
-
-       for _, collection := range []string{"activities", "sleep"} {
-               if err := c.Unsubscribe(ctx, collection); err != nil {
-                       errs = append(errs, fmt.Errorf("Unsubscribe(%q) = %v", collection, err))
-                       continue
-               }
-               log.Infof(ctx, "Successfully unsubscribed from %q", collection)
-       }
-
-       if err := c.DeleteToken(ctx); err != nil {
-               errs = append(errs, fmt.Errorf("DeleteToken() = %v", err))
-       }
-       if len(errs) != 0 {
-               return errs
+       if err := c.UnsubscribeAll(ctx); err != nil {
+               log.Errorf(ctx, "UnsubscribeAll() = %v", err)
+               return fmt.Errorf("deleting all subscriptions failed")
        }
 
        redirectURL := r.URL
@@ -202,12 +185,7 @@ func fitbitDisconnectHandler(ctx context.Context, w http.ResponseWriter, r *http
 }
 
 func googleConnectHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error {
-       c, err := gfit.NewClient(ctx, u)
-       if err != nil {
-               return err
-       }
-
-       http.Redirect(w, r, c.AuthURL(ctx), http.StatusTemporaryRedirect)
+       http.Redirect(w, r, gfit.AuthURL(ctx, u), http.StatusTemporaryRedirect)
        return nil
 }
 
@@ -314,7 +292,7 @@ func handleNotifications(ctx context.Context, payload []byte) error {
 }
 
 func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
-       u, err := app.UserByID(ctx, s.SubscriptionID)
+       u, err := fitbit.UserFromSubscriberID(ctx, s.SubscriptionID)
        if err != nil {
                return err
        }