yesod-auth-account 1.2.4 → 1.2.5

raw patch · 2 files changed

+5/−5 lines, 2 filesdep ~yesod-authdep ~yesod-testPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: yesod-auth, yesod-test

API changes (from Hackage documentation)

+ Yesod.Auth.Account: instance Applicative (AccountPersistDB master user)

+ Yesod.Auth.Account: instance Functor (AccountPersistDB master user)

- Yesod.Auth.Account: class (YesodAuth master, AccountSendEmail master, AccountDB db, UserCredentials (UserAccount db), RenderMessage master FormMessage) => YesodAuthAccount db master | master -> db where checkValidUsername u | all isAlphaNum u = return $ Right u checkValidUsername _ = do { mr <- getMessageRender; return $ Left $ mr MsgInvalidUsername } unregisteredLogin u = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI MsgEmailUnverified; do { (asWidgetT . toWidget) ((preEscapedText . pack) "<p>"); ((liftM (toHtml .) getMessageRender) >>= (\ urender_a8J9 -> (asWidgetT . toWidget) (urender_a8J9 MsgEmailUnverified))); (asWidgetT . toWidget) ((preEscapedText . pack) "</p>"); (asWidgetT . toWidget) (resendVerifyEmailWidget (username u) tm) } } } getNewAccountR = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI RegisterLong; newAccountWidget tm } } postNewAccountR = do { tm <- getRouteToParent; mr <- lift getMessageRender; ((result, _), _) <- lift $ runFormPost $ renderDivs newAccountForm; mdata <- case result of { FormMissing -> invalidArgs ["Form is missing"] FormFailure msg -> return $ Left msg FormSuccess d -> return $ if newAccountPassword1 d == newAccountPassword2 d then Right d else Left [mr PassMismatch] }; case mdata of { Left errs -> do { setMessage $ toHtml $ concat errs; redirect newAccountR } Right d -> do { void $ lift $ createNewAccount d tm; redirect LoginR } } } allowPasswordReset _ = True getResetPasswordR = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI PasswordResetTitle; resetPasswordWidget tm } } setPasswordHandler u = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI SetPassTitle; newPasswordWidget u tm } }

+ Yesod.Auth.Account: class (YesodAuth master, AccountSendEmail master, AccountDB db, UserCredentials (UserAccount db), RenderMessage master FormMessage) => YesodAuthAccount db master | master -> db where checkValidUsername u | all isAlphaNum u = return $ Right u checkValidUsername _ = do { mr <- getMessageRender; return $ Left $ mr MsgInvalidUsername } unregisteredLogin u = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI MsgEmailUnverified; do { (asWidgetT . toWidget) ((preEscapedText . pack) "<p>"); ((liftM (toHtml .) getMessageRender) >>= (\ urender_a8Ih -> (asWidgetT . toWidget) (urender_a8Ih MsgEmailUnverified))); (asWidgetT . toWidget) ((preEscapedText . pack) "</p>"); (asWidgetT . toWidget) (resendVerifyEmailWidget (username u) tm) } } } getNewAccountR = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI RegisterLong; newAccountWidget tm } } postNewAccountR = do { tm <- getRouteToParent; mr <- lift getMessageRender; ((result, _), _) <- lift $ runFormPost $ renderDivs newAccountForm; mdata <- case result of { FormMissing -> invalidArgs ["Form is missing"] FormFailure msg -> return $ Left msg FormSuccess d -> return $ if newAccountPassword1 d == newAccountPassword2 d then Right d else Left [mr PassMismatch] }; case mdata of { Left errs -> do { setMessage $ toHtml $ concat errs; redirect newAccountR } Right d -> do { void $ lift $ createNewAccount d tm; redirect LoginR } } } allowPasswordReset _ = True getResetPasswordR = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI PasswordResetTitle; resetPasswordWidget tm } } setPasswordHandler u = do { tm <- getRouteToParent; lift $ defaultLayout $ do { setTitleI SetPassTitle; newPasswordWidget u tm } }

Yesod/Auth/Account.hs view

@@ -931,7 +931,7 @@  -- | A newtype which when using persistent is an instance of 'AccountDB'. newtype AccountPersistDB master user a = AccountPersistDB (ReaderT (PersistFuncs master user) (HandlerT master IO) a)-    deriving (Monad, MonadIO)+    deriving (Monad, MonadIO, Functor, Applicative)  instance (Yesod master, PersistUserCredentials user) => AccountDB (AccountPersistDB master user) where     type UserAccount (AccountPersistDB master user) = P.Entity user

yesod-auth-account.cabal view

@@ -1,5 +1,5 @@ name:              yesod-auth-account-version:           1.2.4+version:           1.2.5 cabal-version:     >= 1.8 build-type:        Simple synopsis:          An account authentication plugin for Yesod@@ -40,7 +40,7 @@                  , persistent        >= 1.3        && < 1.4                  , pwstore-fast      >= 2.0                  , random            >= 1.0-                 , yesod-auth        >= 1.2        && < 1.3+                 , yesod-auth        >= 1.2        && < 1.4                  , yesod-core        >= 1.2        && < 1.3                  , yesod-form        >= 1.3        && < 1.4                  , yesod-persistent  >= 1.2@@ -61,6 +61,6 @@                  , text                  , xml-conduit                  , yesod         >= 1.2 && < 1.3-                 , yesod-test    >= 1.2-                 , yesod-auth    >= 1.2 && < 1.3+                 , yesod-test    >= 1.2.1.5+                 , yesod-auth    >= 1.2 && < 1.4                  , yesod-auth-account