Merge branch 'master' of github.com:metabase/metabase-init into new_filters

src/metabase/api/common.clj

@@ -70,7 +70,7 @@
 
 ;;; #### checkp- functions: as in "check param". These functions expect that you pass a symbol so they can throw exceptions w/ relevant error messages.
 
-(defn- invalid-param-exception
+(defn invalid-param-exception
   "Create an `ExceptionInfo` that contains information about an invalid API params in the expected format."
   [field-name message]
   (ex-info (format "Invalid field: %s" field-name)

src/metabase/api/session.clj

@@ -87,23 +87,24 @@
   [:as {{:keys [token password] :as body} :body}]
   {token    Required
    password [Required ComplexPassword]}
-  (api-let [400 "Invalid reset token"] [[_ user-id]                           (re-matches #"(^\d+)_.+$" token)
-                                        user-id                               (Integer/parseInt user-id)
-                                        {:keys [reset_token reset_triggered]} (sel :one :fields [User :reset_triggered :reset_token] :id user-id)]
-    ;; Make sure the plaintext token matches up with the hashed one for this user
-    (check (try (creds/bcrypt-verify token reset_token)
-                (catch Throwable _))
-      [400 "Invalid reset token"]
-
-      ;; check that the reset was triggered within the last 1 HOUR, after that the token is considered expired
-      (> (* 60 60 1000) (- (System/currentTimeMillis) (or reset_triggered 0)))
-      [400 "Reset token has expired"])
-    (set-user-password user-id password)
-    ;; after a successful password update go ahead and offer the client a new session that they can use
-    (let [session-id (create-session user-id)]
-      (events/publish-event :user-login {:user_id user-id :session_id session-id})
-      {:success    true
-       :session_id session-id})))
+  (or (when-let [[_ user-id] (re-matches #"(^\d+)_.+$" token)]
+        (let [user-id (Integer/parseInt user-id)]
+          (when-let [{:keys [reset_token reset_triggered]} (sel :one :fields [User :reset_triggered :reset_token] :id user-id)]
+            ;; Make sure the plaintext token matches up with the hashed one for this user
+            (when (try (creds/bcrypt-verify token reset_token)
+                       (catch Throwable _))
+
+              ;; check that the reset was triggered within the last 48 HOURS, after that the token is considered expired
+              (checkp (> (* 48 60 60 1000) (- (System/currentTimeMillis) (or reset_triggered 0)))
+                'password "Reset token has expired")
+
+              (set-user-password user-id password)
+              ;; after a successful password update go ahead and offer the client a new session that they can use
+              (let [session-id (create-session user-id)]
+                (events/publish-event :user-login {:user_id user-id :session_id session-id})
+                {:success    true
+                 :session_id session-id})))))
+      (throw (invalid-param-exception :password "Invalid reset token"))))
 
 
 (defendpoint GET "/properties"

test/metabase/api/session_test.clj

@@ -131,17 +131,17 @@
   (client :post 400 "session/reset_password" {:token "anything"}))
 
 ;; Test that malformed token returns 400
-(expect "Invalid reset token"
+(expect {:errors {:password "Invalid reset token"}}
   (client :post 400 "session/reset_password" {:token "not-found"
                                               :password "whateverUP12!!"}))
 
 ;; Test that invalid token returns 400
-(expect "Invalid reset token"
+(expect {:errors {:password "Invalid reset token"}}
   (client :post 400 "session/reset_password" {:token "1_not-found"
                                               :password "whateverUP12!!"}))
 
 ;; Test that old token can expire
-(expect "Reset token has expired"
+(expect {:errors {:password "Reset token has expired"}}
   (let [token (str (user->id :rasta) "_" (java.util.UUID/randomUUID))]
     (upd User (user->id :rasta) :reset_token token, :reset_triggered 0)
     (client :post 400 "session/reset_password" {:token token