diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs index a1e5a076..d958d86a 100644 --- a/yesod-auth/Yesod/Auth.hs +++ b/yesod-auth/Yesod/Auth.hs @@ -133,12 +133,12 @@ setCreds doRedirects creds = do Nothing -> do rh <- defaultLayout $ addHtml [QQ(shamlet)|

Invalid login |] sendResponse rh Just ar -> do setMessageI Msg.InvalidLogin - redirect RedirectTemporary ar + redirect ar Just aid -> do setSession credsKey $ toPathPiece aid when doRedirects $ do setMessageI Msg.NowLoggedIn - redirectUltDest RedirectTemporary $ loginDest y + redirectUltDest $ loginDest y getCheckR :: YesodAuth m => GHandler Auth m RepHtmlJson getCheckR = do @@ -175,7 +175,7 @@ postLogoutR :: YesodAuth m => GHandler Auth m () postLogoutR = do y <- getYesod deleteSession credsKey - redirectUltDest RedirectTemporary $ logoutDest y + redirectUltDest $ logoutDest y handlePluginR :: YesodAuth m => Text -> [Text] -> GHandler Auth m () handlePluginR plugin pieces = do @@ -222,7 +222,7 @@ redirectLogin = do y <- getYesod setUltDest' case authRoute y of - Just z -> redirect RedirectTemporary z + Just z -> redirect z Nothing -> permissionDenied "Please configure authRoute" instance YesodAuth m => RenderMessage m AuthMessage where diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs index 3aaa68e9..f1c45063 100644 --- a/yesod-auth/Yesod/Auth/Email.hs +++ b/yesod-auth/Yesod/Auth/Email.hs @@ -163,7 +163,7 @@ getVerifyR lid key = do setCreds False $ Creds "email" email [("verifiedEmail", email)] -- FIXME uid? toMaster <- getRouteToMaster setMessageI Msg.AddressVerified - redirect RedirectTemporary $ toMaster setpassR + redirect $ toMaster setpassR _ -> return () defaultLayout $ do setTitleI Msg.InvalidKey @@ -193,7 +193,7 @@ postLoginR = do Nothing -> do setMessageI Msg.InvalidEmailPass toMaster <- getRouteToMaster - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR getPasswordR :: YesodAuthEmail master => GHandler Auth master RepHtml getPasswordR = do @@ -203,7 +203,7 @@ getPasswordR = do Just _ -> return () Nothing -> do setMessageI Msg.BadSetPass - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR defaultLayout $ do setTitleI Msg.SetPassTitle addWidget @@ -233,17 +233,17 @@ postPasswordR = do y <- getYesod when (new /= confirm) $ do setMessageI Msg.PassMismatch - redirect RedirectTemporary $ toMaster setpassR + redirect $ toMaster setpassR maid <- maybeAuthId aid <- case maid of Nothing -> do setMessageI Msg.BadSetPass - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR Just aid -> return aid salted <- liftIO $ saltPass new setPassword aid salted setMessageI Msg.PassUpdated - redirect RedirectTemporary $ loginDest y + redirect $ loginDest y saltLength :: Int saltLength = 5 diff --git a/yesod-auth/Yesod/Auth/Facebook.hs b/yesod-auth/Yesod/Auth/Facebook.hs index 10b1cb2f..b76aff70 100644 --- a/yesod-auth/Yesod/Auth/Facebook.hs +++ b/yesod-auth/Yesod/Auth/Facebook.hs @@ -71,7 +71,7 @@ authFacebook cid secret perms = tm <- getRouteToMaster render <- getUrlRender let fb = Facebook.Facebook cid secret $ render $ tm url - redirectText RedirectTemporary $ Facebook.getForwardUrl fb perms + redirect $ Facebook.getForwardUrl fb perms dispatch "GET" [] = do render <- getUrlRender tm <- getRouteToMaster @@ -92,11 +92,11 @@ authFacebook cid secret perms = case mtoken of Nothing -> do -- Well... then just logout from our app. - redirect RedirectTemporary (tm LogoutR) + redirect (tm LogoutR) Just at -> do render <- getUrlRender let logout = Facebook.getLogoutUrl at (render $ tm LogoutR) - redirectText RedirectTemporary logout + redirect logout dispatch _ _ = notFound login tm = do render <- lift getUrlRender diff --git a/yesod-auth/Yesod/Auth/GoogleEmail.hs b/yesod-auth/Yesod/Auth/GoogleEmail.hs index a54606a9..7ac6c16d 100644 --- a/yesod-auth/Yesod/Auth/GoogleEmail.hs +++ b/yesod-auth/Yesod/Auth/GoogleEmail.hs @@ -61,14 +61,14 @@ authGoogleEmail = attempt (\err -> do setMessage $ toHtml $ show err - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR ) - (redirectText RedirectTemporary) + redirect res Nothing -> do toMaster <- getRouteToMaster setMessageI Msg.NoOpenID - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR dispatch "GET" ["complete", ""] = dispatch "GET" ["complete"] -- compatibility issues dispatch "GET" ["complete"] = do rr <- getRequest @@ -85,15 +85,15 @@ completeHelper gets' = do toMaster <- getRouteToMaster let onFailure err = do setMessage $ toHtml $ show err - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR let onSuccess (OpenId.Identifier ident, _) = do 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 [] (_, False) -> do setMessage "Only Google login is supported" - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR (Nothing, _) -> do setMessage "No email address provided" - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR attempt onFailure onSuccess res diff --git a/yesod-auth/Yesod/Auth/HashDB.hs b/yesod-auth/Yesod/Auth/HashDB.hs index 583f6af9..6c8c9a60 100644 --- a/yesod-auth/Yesod/Auth/HashDB.hs +++ b/yesod-auth/Yesod/Auth/HashDB.hs @@ -179,7 +179,7 @@ postLoginR uniq = do then setCreds True $ Creds "hashdb" (fromMaybe "" mu) [] else do setMessage [QQ(shamlet)| Invalid username/password |] toMaster <- getRouteToMaster - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR -- | A drop in for the getAuthId method of your YesodAuth instance which @@ -208,7 +208,7 @@ getAuthIdHashDB authR uniq creds = do Just (uid, _) -> return $ Just uid Nothing -> do setMessage [QQ(shamlet)| User not found |] - redirect RedirectTemporary $ authR LoginR + redirect $ authR LoginR -- | Prompt for username and password, validate that against a database -- which holds the username and a hash of the password diff --git a/yesod-auth/Yesod/Auth/Kerberos.hs b/yesod-auth/Yesod/Auth/Kerberos.hs index 57f95033..c91c6e29 100644 --- a/yesod-auth/Yesod/Auth/Kerberos.hs +++ b/yesod-auth/Yesod/Auth/Kerberos.hs @@ -99,7 +99,7 @@ postLoginR config = do let errorMessage (message :: Text) = do setMessage [QQ(shamlet)|Error: #{message}|] toMaster <- getRouteToMaster - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR case (mu,mp) of (Nothing, _ ) -> errorMessage "Please fill in your username" diff --git a/yesod-auth/Yesod/Auth/OAuth.hs b/yesod-auth/Yesod/Auth/OAuth.hs index c08fe8b2..d93d2131 100644 --- a/yesod-auth/Yesod/Auth/OAuth.hs +++ b/yesod-auth/Yesod/Auth/OAuth.hs @@ -53,7 +53,7 @@ authOAuth name ident reqUrl accUrl authUrl key sec = AuthPlugin name dispatch lo tm <- getRouteToMaster let oauth' = oauth { oauthCallback = Just $ encodeUtf8 $ render $ tm url } tok <- liftIO $ getTemporaryCredential oauth' - redirectText RedirectTemporary (fromString $ authorizeUrl oauth' tok) + redirect $ authorizeUrl oauth' tok dispatch "GET" [] = do (verifier, oaTok) <- runInputGet $ (,) <$> ireq textField "oauth_verifier" diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs index b5b1686b..5eca0a93 100644 --- a/yesod-auth/Yesod/Auth/OpenId.hs +++ b/yesod-auth/Yesod/Auth/OpenId.hs @@ -64,14 +64,14 @@ authOpenIdExtended extensionFields = attempt (\err -> do setMessage $ toHtml $ show err - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR ) - (redirectText RedirectTemporary) + redirect res Nothing -> do toMaster <- getRouteToMaster setMessageI Msg.NoOpenID - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR dispatch "GET" ["complete", ""] = dispatch "GET" ["complete"] -- compatibility issues dispatch "GET" ["complete"] = do rr <- getRequest @@ -88,7 +88,7 @@ completeHelper gets' = do toMaster <- getRouteToMaster let onFailure err = do setMessage $ toHtml $ show err - redirect RedirectTemporary $ toMaster LoginR + redirect $ toMaster LoginR let onSuccess (OpenId.Identifier ident, _) = setCreds True $ Creds "openid" ident gets' attempt onFailure onSuccess res diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 84d4f873..3b6f34c6 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -21,7 +21,7 @@ library cpp-options: -DGHC7 else build-depends: base >= 4 && < 4.3 - build-depends: authenticate >= 0.11 && < 0.12 + build-depends: authenticate >= 0.11.1 && < 0.12 , bytestring >= 0.9.1.4 && < 0.10 , yesod-core >= 0.10 && < 0.11 , wai >= 1.0 && < 1.1