Skip to content
Snippets Groups Projects
Commit 271a6d5d authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge pull request #2487 from metabase/one-more-fix-for-join-activity

need to have `:last_login` on the user record we lookup during login.
parents d96f4b9e 526ef432
Branches
Tags
Loading
......@@ -38,7 +38,7 @@
password [Required NonEmptyString]}
(throttle/check (login-throttlers :ip-address) remote-address)
(throttle/check (login-throttlers :email) email)
(let [user (sel :one :fields [User :id :password_salt :password], :email email (k/where {:is_active true}))]
(let [user (sel :one :fields [User :id :password_salt :password :last_login], :email email (k/where {:is_active true}))]
;; Don't leak whether the account doesn't exist or the password was incorrect
(when-not (and user
(pass/verify-password password (:password_salt user) (:password user)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment