From f0cd04fa975479c6ae9d3f3b99b3c99b1b5e3044 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 Oct 2010 19:46:48 +0200 Subject: [PATCH] loginHandler --- Yesod/Helpers/Auth2.hs | 12 ++++++++---- yesod-auth.cabal | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Yesod/Helpers/Auth2.hs b/Yesod/Helpers/Auth2.hs index 616cb434..64614ef3 100644 --- a/Yesod/Helpers/Auth2.hs +++ b/Yesod/Helpers/Auth2.hs @@ -62,6 +62,13 @@ class Yesod m => YesodAuth m where authPlugins :: [AuthPlugin m] + -- | What to show on the login page. + loginHandler :: GHandler Auth m RepHtml + loginHandler = defaultLayout $ do + setTitle $ string "Login" + tm <- liftHandler getRouteToMaster + mapM_ (flip apLogin tm) authPlugins + mkYesodSub "Auth" [ ClassP ''YesodAuth [VarT $ mkName "master"] ] [$parseRoutes| @@ -120,10 +127,7 @@ $nothing ] getLoginR :: YesodAuth m => GHandler Auth m RepHtml -getLoginR = defaultLayout $ do - setTitle $ string "Login" - tm <- liftHandler getRouteToMaster - mapM_ (flip apLogin tm) authPlugins +getLoginR = loginHandler getLogoutR :: YesodAuth m => GHandler Auth m () getLogoutR = postLogoutR -- FIXME redirect to post diff --git a/yesod-auth.cabal b/yesod-auth.cabal index 0bb7a11f..75c151a9 100644 --- a/yesod-auth.cabal +++ b/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 0.1.2 +version: 0.1.3 license: BSD3 license-file: LICENSE author: Michael Snoyman