diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,8 @@ +## 1.4.13 + +* Add a CSRF token to the login form from `Yesod.Auth.Hardcoded`, making it compatible with the CSRF middleware [#1161](https://github.com/yesodweb/yesod/pull/1161) +* Multiple session messages. [#1187](https://github.com/yesodweb/yesod/pull/1187) + ## 1.4.12 * Deprecated Yesod.Auth.GoogleEmail diff --git a/Yesod/Auth.hs b/Yesod/Auth.hs --- a/Yesod/Auth.hs +++ b/Yesod/Auth.hs @@ -189,9 +189,9 @@ authHttpManager :: master -> Manager -- | Called on a successful login. By default, calls - -- @setMessageI NowLoggedIn@. + -- @addMessageI "success" NowLoggedIn@. onLogin :: HandlerT master IO () - onLogin = setMessageI Msg.NowLoggedIn + onLogin = addMessageI "success" Msg.NowLoggedIn -- | Called on logout. By default, does nothing onLogout :: HandlerT master IO () @@ -214,10 +214,10 @@ maybeAuthId = defaultMaybeAuthId -- | Called on login error for HTTP requests. By default, calls - -- @setMessage@ and redirects to @dest@. + -- @addMessage@ with "error" as status and redirects to @dest@. onErrorHtml :: (MonadResourceBase m) => Route master -> Text -> HandlerT master m Html onErrorHtml dest msg = do - setMessage $ toHtml msg + addMessage "error" $ toHtml msg fmap asHtml $ redirect dest -- | runHttpRequest gives you a chance to handle an HttpException and retry diff --git a/Yesod/Auth/BrowserId.hs b/Yesod/Auth/BrowserId.hs --- a/Yesod/Auth/BrowserId.hs +++ b/Yesod/Auth/BrowserId.hs @@ -2,7 +2,10 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE RecordWildCards #-} +-- | NOTE: Mozilla Persona will be shut down by the end of 2016, therefore this +-- module is no longer recommended for use. module Yesod.Auth.BrowserId + {-# DEPRECATED "Mozilla Persona will be shut down by the end of 2016" #-} ( authBrowserId , createOnClick, createOnClickOverride , def diff --git a/Yesod/Auth/Email.hs b/Yesod/Auth/Email.hs --- a/Yesod/Auth/Email.hs +++ b/Yesod/Auth/Email.hs @@ -107,6 +107,11 @@ , emailCredsEmail :: Email } +data ForgotPasswordForm = ForgotPasswordForm { forgotEmail :: Text } +data PasswordForm = PasswordForm { passwordCurrent :: Text, passwordNew :: Text, passwordConfirm :: Text } +data UserForm = UserForm { email :: Text } +data UserLoginForm = UserLoginForm { loginEmail :: Text, loginPassword :: Text } + class ( YesodAuth site , PathPiece (AuthEmailId site) , (RenderMessage site Msg.AuthMessage) @@ -253,30 +258,9 @@ -> AuthHandler site TypedContent setPasswordHandler = defaultSetPasswordHandler - -authEmail :: YesodAuthEmail m => AuthPlugin m +authEmail :: (YesodAuthEmail m) => AuthPlugin m authEmail = - AuthPlugin "email" dispatch $ \tm -> - [whamlet| -$newline never -
- - - - -
_{Msg.Email} - - -
_{Msg.Password} - - -
-