diff --git a/Yesod/Auth.hs b/Yesod/Auth.hs --- a/Yesod/Auth.hs +++ b/Yesod/Auth.hs @@ -149,7 +149,10 @@ Nothing -> when doRedirects $ do case authRoute y of - Nothing -> do rh <- defaultLayout $ toWidget [shamlet|

Invalid login |] + Nothing -> do rh <- defaultLayout $ toWidget [shamlet| +$newline never +

Invalid login +|] sendResponse rh Just ar -> do setMessageI Msg.InvalidLogin redirect ar @@ -168,6 +171,7 @@ where html' creds = [shamlet| +$newline never

Authentication Status $maybe _ <- creds

Logged in. diff --git a/Yesod/Auth/BrowserId.hs b/Yesod/Auth/BrowserId.hs --- a/Yesod/Auth/BrowserId.hs +++ b/Yesod/Auth/BrowserId.hs @@ -62,6 +62,7 @@ , apLogin = \toMaster -> do addScriptRemote browserIdJs toWidget [hamlet| +$newline never

diff --git a/Yesod/Auth/Dummy.hs b/Yesod/Auth/Dummy.hs --- a/Yesod/Auth/Dummy.hs +++ b/Yesod/Auth/Dummy.hs @@ -24,6 +24,7 @@ url = PluginR "dummy" [] login authToMaster = toWidget [hamlet| +$newline never

Your new identifier is: # diff --git a/Yesod/Auth/Email.hs b/Yesod/Auth/Email.hs --- a/Yesod/Auth/Email.hs +++ b/Yesod/Auth/Email.hs @@ -79,6 +79,7 @@ authEmail = AuthPlugin "email" dispatch $ \tm -> [whamlet| +$newline never @@ -112,6 +113,7 @@ defaultLayout $ do setTitleI Msg.RegisterLong [whamlet| +$newline never

_{Msg.EnterEmail}

_{Msg.ConfirmationEmailSent email} |] + [whamlet| +$newline never +

_{Msg.ConfirmationEmailSent email} +|] getVerifyR :: YesodAuthEmail m => AuthEmailId m -> Text -> GHandler Auth m RepHtml @@ -161,7 +166,10 @@ _ -> return () defaultLayout $ do setTitleI Msg.InvalidKey - [whamlet|

_{Msg.InvalidKey} |] + [whamlet| +$newline never +

_{Msg.InvalidKey} +|] postLoginR :: YesodAuthEmail master => GHandler Auth master () postLoginR = do @@ -200,6 +208,7 @@ defaultLayout $ do setTitleI Msg.SetPassTitle [whamlet| +$newline never

_{Msg.SetPass}

diff --git a/Yesod/Auth/GoogleEmail.hs b/Yesod/Auth/GoogleEmail.hs --- a/Yesod/Auth/GoogleEmail.hs +++ b/Yesod/Auth/GoogleEmail.hs @@ -31,19 +31,25 @@ import qualified Data.Text as T import Control.Exception.Lifted (try, SomeException) +pid :: Text +pid = "googleemail" + forwardUrl :: AuthRoute -forwardUrl = PluginR "googleemail" ["forward"] +forwardUrl = PluginR pid ["forward"] googleIdent :: Text googleIdent = "https://www.google.com/accounts/o8/id" authGoogleEmail :: YesodAuth m => AuthPlugin m authGoogleEmail = - AuthPlugin "googleemail" dispatch login + AuthPlugin pid dispatch login where - complete = PluginR "googleemail" ["complete"] + complete = PluginR pid ["complete"] login tm = - [whamlet|_{Msg.LoginGoogle}|] + [whamlet| +$newline never +_{Msg.LoginGoogle} +|] dispatch "GET" ["forward"] = do render <- getUrlRender toMaster <- getRouteToMaster @@ -86,7 +92,7 @@ let OpenId.Identifier ident = OpenId.oirOpLocal oir memail <- lookupGetParam "openid.ext1.value.email" case (memail, "https://www.google.com/accounts/o8/id" `T.isPrefixOf` ident) of - (Just email, True) -> setCreds True $ Creds "openid" email [] + (Just email, True) -> setCreds True $ Creds pid email [] (_, False) -> do setMessage "Only Google login is supported" redirect $ toMaster LoginR diff --git a/Yesod/Auth/HashDB.hs b/Yesod/Auth/HashDB.hs --- a/Yesod/Auth/HashDB.hs +++ b/Yesod/Auth/HashDB.hs @@ -76,7 +76,7 @@ import Yesod.Form import Yesod.Auth import Yesod.Widget (toWidget) -import Text.Hamlet (hamlet, shamlet) +import Text.Hamlet (hamlet) import Control.Applicative ((<$>), (<*>)) import Control.Monad (replicateM,liftM) @@ -176,7 +176,7 @@ (validateUser <$> (uniq =<< mu) <*> mp) if isValid then setCreds True $ Creds "hashdb" (fromMaybe "" mu) [] - else do setMessage [shamlet| Invalid username/password |] + else do setMessage "Invalid username/password" toMaster <- getRouteToMaster redirect $ toMaster LoginR @@ -207,7 +207,7 @@ -- user exists Just (Entity uid _) -> return $ Just uid Nothing -> do - setMessage [shamlet| User not found |] + setMessage "User not found" redirect $ authR LoginR -- | Prompt for username and password, validate that against a database @@ -221,6 +221,7 @@ , PersistUnique b (GHandler Auth m)) => (Text -> Maybe (Unique user b)) -> AuthPlugin m authHashDB uniq = AuthPlugin "hashdb" dispatch $ \tm -> toWidget [hamlet| +$newline never