Package app: Implement User.DeleteToken() and User.String()

[kraftakt.git] / kraftakt.go

diff --git a/kraftakt.go b/kraftakt.go
index 69815c2..b49f787 100644 (file)
--- a/kraftakt.go
+++ b/kraftakt.go
@@ -28,10 +28,6 @@ func init() {
        http.HandleFunc("/google/setup", googleSetupHandler)
        http.Handle("/google/grant", AuthenticatedHandler(googleGrantHandler))
        http.Handle("/", AuthenticatedHandler(indexHandler))
-
-       if err := app.LoadConfig(context.Background()); err != nil {
-               panic(err)
-       }
 }
 
 // ContextHandler implements http.Handler
@@ -40,6 +36,11 @@ type ContextHandler func(context.Context, http.ResponseWriter, *http.Request) er
 func (hndl ContextHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
        ctx := appengine.NewContext(r)
 
+       if err := app.LoadConfig(ctx); err != nil {
+               http.Error(w, err.Error(), http.StatusInternalServerError)
+               return
+       }
+
        if err := hndl(ctx, w, r); err != nil {
                http.Error(w, err.Error(), http.StatusInternalServerError)
                return
@@ -51,6 +52,11 @@ type AuthenticatedHandler func(context.Context, http.ResponseWriter, *http.Reque
 func (hndl AuthenticatedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
        ctx := appengine.NewContext(r)
 
+       if err := app.LoadConfig(ctx); err != nil {
+               http.Error(w, err.Error(), http.StatusInternalServerError)
+               return
+       }
+
        gaeUser := user.Current(ctx)
        if gaeUser == nil {
                url, err := user.LoginURL(ctx, r.URL.String())
@@ -191,6 +197,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
        }
@@ -206,6 +213,10 @@ func fitbitNotifyHandler(ctx context.Context, w http.ResponseWriter, r *http.Req
 // handleNotifications parses fitbit notifications and requests the individual
 // activities from Fitbit. It is executed asynchronously via the delay package.
 func handleNotifications(ctx context.Context, payload []byte) error {
+       if err := app.LoadConfig(ctx); err != nil {
+               return err
+       }
+
        var subscriptions []fitbit.Subscription
        if err := json.Unmarshal(payload, &subscriptions); err != nil {
                return err
@@ -311,7 +322,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
                }
        }()