yesod-auth-kerberos 1.0.2 → 1.2.0

raw patch · 2 files changed

+12/−15 lines, 2 filesdep ~yesod-authdep ~yesod-coredep ~yesod-form

Dependency ranges changed: yesod-auth, yesod-core, yesod-form

Files

• Yesod/Auth/Kerberos.hs +8/−11
• yesod-auth-kerberos.cabal +4/−4

@@ -33,9 +33,7 @@ import Data.Text (Text) import qualified Data.Text as T import Text.Hamlet-import Yesod.Handler-import Yesod.Widget-import Control.Monad.IO.Class (liftIO)+import Yesod.Core import Yesod.Form import Control.Applicative ((<$>), (<*>)) @@ -91,25 +89,24 @@ authKerberos = genericAuthKerberos defaultKerberosConfig  -- | Handle the login form-postLoginR :: (YesodAuth y) => KerberosConfig -> GHandler Auth y ()+postLoginR :: (YesodAuth master) => KerberosConfig -> HandlerT Auth (HandlerT master IO) () postLoginR config = do-    (mu,mp) <- runInputPost $ (,)+    (mu,mp) <- lift $ runInputPost $ (,)         <$> iopt textField "username"         <*> iopt textField "password"      let errorMessage (message :: Text) = do-        setMessage [QQ(shamlet)|$newline never+        lift $ setMessage [QQ(shamlet)|$newline never             Error: #{message}           |]-        toMaster <- getRouteToMaster-        redirect $ toMaster LoginR+        redirect LoginR      case (mu,mp) of         (Nothing, _      ) -> do-            mr <- getMessageRender+            mr <- lift getMessageRender             errorMessage $ mr PleaseProvideUsername         (_      , Nothing) -> do-            mr <- getMessageRender+            mr <- lift getMessageRender             errorMessage $ mr PleaseProvidePassword         (Just u , Just p ) -> do           result <- liftIO $ loginKerberos (usernameModifier config u) p@@ -120,6 +117,6 @@                       , credsPlugin = "Kerberos"                       , credsExtra  = []                       }-                setCreds True creds+                lift $ setCreds True creds             kerberosError -> errorMessage (T.pack $ show kerberosError) 

@@ -1,5 +1,5 @@ name:            yesod-auth-kerberos-version:         1.0.2+version:         1.2.0 license:         BSD3 license-file:    LICENSE author:          Arash Rouhani@@ -22,9 +22,9 @@     else         build-depends:   base                >= 4        && < 4.3     build-depends:   authenticate-kerberos   >= 1.0       && < 1.1-                   , yesod-core              >= 1.0.0     && < 2.0.0-                   , yesod-auth              >= 1.0.0     && < 2.0.0-                   , yesod-form              >= 1.0.0     && < 2.0.0+                   , yesod-core              >= 1.2.0     && < 2.0.0+                   , yesod-auth              >= 1.2.0     && < 2.0.0+                   , yesod-form              >= 1.3.0     && < 2.0.0                    , hamlet                  >= 1.1.0     && < 2.0.0                    , bytestring              >= 0.9.1.4   && < 0.11                    , text                    >= 0.7       && < 0.12