yesod-auth 1.4.7 → 1.4.8

raw patch · 3 files changed

+22/−4 lines, 3 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

- Yesod.Auth.Email: class (YesodAuth site, PathPiece (AuthEmailId site), RenderMessage site AuthMessage) => YesodAuthEmail site where type family AuthEmailId site randomKey _ = nonce128urlT defaultNonceGen needOldPassword aid' = do { mkey <- lookupSession loginLinkKey; case mkey >>= readMay . unpack of { Just (aidT, time) | Just aid <- fromPathPiece aidT, toPathPiece (aid `asTypeOf` aid') == toPathPiece aid' -> do { now <- liftIO getCurrentTime; return $ addUTCTime (60 * 30) time <= now } _ -> return True } } checkPasswordSecurity _ x | length x >= 3 = return $ Right () | otherwise = return $ Left "Password must be at least three characters" confirmationEmailSentResponse identifier = do { mr <- getMessageRender; selectRep $ do { provideJsonMessage (mr msg); provideRep $ authLayout $ do { setTitleI ConfirmationEmailSentTitle; (do { (asWidgetT . toWidget) ((preEscapedText . pack) "<p>"); ((liftM (toHtml .) getMessageRender) >>= (\ urender_ayUY -> (asWidgetT . toWidget) (urender_ayUY msg))); (asWidgetT . toWidget) ((preEscapedText . pack) "</p>\n") }) } } } where msg = ConfirmationEmailSent identifier normalizeEmailAddress _ = toLower registerHandler = defaultRegisterHandler forgotPasswordHandler = defaultForgotPasswordHandler setPasswordHandler = defaultSetPasswordHandler

+ Yesod.Auth.Email: class (YesodAuth site, PathPiece (AuthEmailId site), RenderMessage site AuthMessage) => YesodAuthEmail site where type family AuthEmailId site randomKey _ = nonce128urlT defaultNonceGen needOldPassword aid' = do { mkey <- lookupSession loginLinkKey; case mkey >>= readMay . unpack of { Just (aidT, time) | Just aid <- fromPathPiece aidT, toPathPiece (aid `asTypeOf` aid') == toPathPiece aid' -> do { now <- liftIO getCurrentTime; return $ addUTCTime (60 * 30) time <= now } _ -> return True } } checkPasswordSecurity _ x | length x >= 3 = return $ Right () | otherwise = return $ Left "Password must be at least three characters" confirmationEmailSentResponse identifier = do { mr <- getMessageRender; selectRep $ do { provideJsonMessage (mr msg); provideRep $ authLayout $ do { setTitleI ConfirmationEmailSentTitle; (do { (asWidgetT . toWidget) ((preEscapedText . pack) "<p>"); ((liftM (toHtml .) getMessageRender) >>= (\ urender_ayV3 -> (asWidgetT . toWidget) (urender_ayV3 msg))); (asWidgetT . toWidget) ((preEscapedText . pack) "</p>\n") }) } } } where msg = ConfirmationEmailSent identifier normalizeEmailAddress _ = toLower registerHandler = defaultRegisterHandler forgotPasswordHandler = defaultForgotPasswordHandler setPasswordHandler = defaultSetPasswordHandler

Files

ChangeLog.md +4/−0
Yesod/Auth/GoogleEmail2.hs +17/−3
yesod-auth.cabal +1/−1

ChangeLog.md view

@@ -1,3 +1,7 @@+## 1.4.8++* GoogleEmail2: proper error message when permission denied+ ## 1.4.7  * add a runHttpRequest function for handling HTTP errors

Yesod/Auth/GoogleEmail2.hs view

@@ -50,14 +50,17 @@ import           Yesod.Auth               (Auth, AuthPlugin (AuthPlugin),                                            AuthRoute, Creds (Creds),                                            Route (PluginR), YesodAuth,-                                           runHttpRequest, setCredsRedirect)+                                           runHttpRequest, setCredsRedirect,+                                           logoutDest) import qualified Yesod.Auth.Message       as Msg import           Yesod.Core               (HandlerSite, HandlerT, MonadHandler,                                            TypedContent, getRouteToParent,                                            getUrlRender, invalidArgs,                                            lift, liftIO, lookupGetParam,                                            lookupSession, notFound, redirect,-                                           setSession, whamlet, (.:))+                                           setSession, whamlet, (.:),+                                           setMessage, getYesod, authRoute,+                                           toHtml)   import           Blaze.ByteString.Builder (fromByteString, toByteString)@@ -187,7 +190,18 @@         mcode <- lookupGetParam "code"         code <-             case mcode of-                Nothing -> invalidArgs ["Missing code paramter"]+                Nothing -> do+                    merr <- lookupGetParam "error"+                    case merr of+                        Nothing -> invalidArgs ["Missing code paramter"]+                        Just err -> do+                            master <- lift getYesod+                            let msg =+                                    case err of+                                        "access_denied" -> "Access denied"+                                        _ -> "Unknown error occurred: " `T.append` err+                            setMessage $ toHtml msg+                            lift $ redirect $ logoutDest master                 Just c -> return c          render <- getUrlRender

yesod-auth.cabal view

@@ -1,5 +1,5 @@ name:            yesod-auth-version:         1.4.7+version:         1.4.8 license:         MIT license-file:    LICENSE author:          Michael Snoyman, Patrick Brisbin