haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warnings

Browse Source
This commit is contained in:
Michael Snoyman 2010-10-10 10:32:08 +02:00
parent 7e19ee0789
commit 18e901fa52
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Yesod/Helpers/Auth2/Email.hs
View File

@ -12,7 +12,6 @@ import System.Random
import Control.Monad (when) import Control.Monad (when)
import Control.Applicative ((<$>), (<*>)) import Control.Applicative ((<$>), (<*>))
import Data.Digest.Pure.MD5 import Data.Digest.Pure.MD5
import Data.String (fromString)
import qualified Data.ByteString.Lazy.UTF8 as LU import qualified Data.ByteString.Lazy.UTF8 as LU
login, register, setpass :: AuthRoute login, register, setpass :: AuthRoute
@ -143,7 +142,7 @@ getVerifyR lid key = do
muid <- verifyAccount lid muid <- verifyAccount lid
case muid of case muid of
Nothing -> return () Nothing -> return ()
Just uid -> do Just _uid -> do
setCreds False $ Creds "email" email [("verifiedEmail", email)] -- FIXME uid? setCreds False $ Creds "email" email [("verifiedEmail", email)] -- FIXME uid?
toMaster <- getRouteToMaster toMaster <- getRouteToMaster
setMessage $ string "Address verified, please set a new password" setMessage $ string "Address verified, please set a new password"
@ -160,7 +159,6 @@ postLoginR = do
(email, pass) <- runFormPost' $ (,) (email, pass) <- runFormPost' $ (,)
<$> emailInput "email" <$> emailInput "email"
<*> stringInput "password" <*> stringInput "password"
y <- getYesod
mecreds <- getEmailCreds email mecreds <- getEmailCreds email
maid <- maid <-
case (mecreds >>= emailCredsAuthId, fmap emailCredsStatus mecreds) of case (mecreds >>= emailCredsAuthId, fmap emailCredsStatus mecreds) of
@ -174,7 +172,7 @@ postLoginR = do
else Nothing else Nothing
_ -> return Nothing _ -> return Nothing
case maid of case maid of
Just aid -> Just _aid ->
setCreds True $ Creds "email" email [("verifiedEmail", email)] -- FIXME aid? setCreds True $ Creds "email" email [("verifiedEmail", email)] -- FIXME aid?
Nothing -> do Nothing -> do
setMessage $ string "Invalid email/password combination" setMessage $ string "Invalid email/password combination"