X-Git-Url: https://git.octo.it/?p=kraftakt.git;a=blobdiff_plain;f=kraftakt.go;h=61a576edf720a6df71e700d4762eca6c6a2f069d;hp=8d562996688c99d5fecb12bb23dcbbd6ae8dbd76;hb=ac25c9764310be649dc18d0a02a1c127f0d73565;hpb=5b245cc42860c980c321c1c1829cdc373d53ac53

diff --git a/kraftakt.go b/kraftakt.go
index 8d56299..61a576e 100644
--- a/kraftakt.go
+++ b/kraftakt.go
@@ -171,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