diff --git a/yesod-auth/Yesod/Auth/HashDB.hs b/yesod-auth/Yesod/Auth/HashDB.hs index 358c9345..27a81269 100644 --- a/yesod-auth/Yesod/Auth/HashDB.hs +++ b/yesod-auth/Yesod/Auth/HashDB.hs @@ -102,6 +102,12 @@ class HashDBUser user where setUserHashAndSalt :: Text -- ^ Salt -> Text -- ^ Password hash -> user -> user + setUserHashAndSalt = setSaltAndUserHash + + setSaltAndUserHash :: Text -- ^ Salt + -> Text -- ^ Password hash + -> user -> user + setSaltAndUserHash = setUserHashAndSalt -- | Generate random salt. Length of 8 is chosen arbitrarily randomSalt :: MonadIO m => m Text @@ -118,7 +124,7 @@ saltedHash salt = -- passwords. It generates random salt and calculates proper hashes. setPassword :: (MonadIO m, HashDBUser user) => Text -> user -> m user setPassword pwd u = do salt <- randomSalt - return $ setUserHashAndSalt salt (saltedHash salt pwd) u + return $ setSaltAndUserHash salt (saltedHash salt pwd) u ---------------------------------------------------------------- @@ -256,6 +262,6 @@ User instance HashDBUser (UserGeneric backend) where userPasswordHash = Just . userPassword userPasswordSalt = Just . userSalt - setUserHashAndSalt s h u = u { userSalt = s + setSaltAndUserHash s h u = u { userSalt = s , userPassword = h }