Implement Fitbit and Google Fit disconnect handlers.

[kraftakt.git] / kraftakt.go

diff --git a/kraftakt.go b/kraftakt.go
index 66668a6..1f3ac98 100644 (file)
--- a/kraftakt.go
+++ b/kraftakt.go
@@ -22,11 +22,13 @@ import (
 var delayedHandleNotifications = delay.Func("handleNotifications", handleNotifications)
 
 func init() {
-       http.HandleFunc("/fitbit/setup", fitbitSetupHandler)
+       http.Handle("/fitbit/connect", AuthenticatedHandler(fitbitConnectHandler))
        http.Handle("/fitbit/grant", AuthenticatedHandler(fitbitGrantHandler))
        http.Handle("/fitbit/notify", ContextHandler(fitbitNotifyHandler))
-       http.HandleFunc("/google/setup", googleSetupHandler)
+       http.Handle("/fitbit/disconnect", AuthenticatedHandler(fitbitDisconnectHandler))
+       http.Handle("/google/connect", AuthenticatedHandler(googleConnectHandler))
        http.Handle("/google/grant", AuthenticatedHandler(googleGrantHandler))
+       http.Handle("/google/disconnect", AuthenticatedHandler(googleDisconnectHandler))
        http.Handle("/", AuthenticatedHandler(indexHandler))
 }
 
@@ -123,8 +125,9 @@ func indexHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u
        return nil
 }
 
-func fitbitSetupHandler(w http.ResponseWriter, r *http.Request) {
+func fitbitConnectHandler(_ context.Context, w http.ResponseWriter, r *http.Request, _ *app.User) error {
        http.Redirect(w, r, fitbit.AuthURL(), http.StatusTemporaryRedirect)
+       return nil
 }
 
 func fitbitGrantHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error {
@@ -197,6 +200,7 @@ 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
        }
@@ -321,7 +325,7 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
                        break
                }
                if err := gfitClient.SetDistance(ctx, distanceMeters, tm); err != nil {
-                       errs = append(errs, fmt.Errorf("gfitClient.SetDistance(%d) = %v", distanceMeters, err))
+                       errs = append(errs, fmt.Errorf("gfitClient.SetDistance(%g) = %v", distanceMeters, err))
                        return
                }
        }()