From 1067816b5d750f0e837097ca80646585db03dedf Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Tue, 16 Sep 2014 18:10:40 -0700 Subject: [PATCH 1/2] fix confirmation email status I screwed this up in a big re-factoring in 153654ad --- yesod-auth/Yesod/Auth/Email.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs index 95def734..243a1ff8 100644 --- a/yesod-auth/Yesod/Auth/Email.hs +++ b/yesod-auth/Yesod/Auth/Email.hs @@ -182,7 +182,9 @@ class ( YesodAuth site confirmationEmailSentResponse :: Text -> HandlerT site IO TypedContent confirmationEmailSentResponse identifier = do mr <- getMessageRender - messageJson401 (mr msg) $ authLayout $ do + selectRep $ do + provideJsonMessage (mr msg) + provideRep $ authLayout $ do setTitleI Msg.ConfirmationEmailSentTitle [whamlet|

_{msg}|] where From 2a305191694a3426a1db507b288bce04f191ec98 Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Tue, 16 Sep 2014 18:13:28 -0700 Subject: [PATCH 2/2] fix some import warnings --- yesod-auth/Yesod/Auth.hs | 2 +- yesod-auth/Yesod/Auth/Email.hs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs index 8ba7a9ee..7ea0b24f 100644 --- a/yesod-auth/Yesod/Auth.hs +++ b/yesod-auth/Yesod/Auth.hs @@ -47,7 +47,7 @@ import Control.Monad (when) import Control.Monad.Trans.Maybe import Yesod.Auth.Routes -import Data.Aeson +import Data.Aeson hiding (json) import Data.Text.Encoding (decodeUtf8With) import Data.Text.Encoding.Error (lenientDecode) import Data.Text (Text) diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs index 243a1ff8..21d0de50 100644 --- a/yesod-auth/Yesod/Auth/Email.hs +++ b/yesod-auth/Yesod/Auth/Email.hs @@ -36,9 +36,7 @@ import Yesod.Auth import System.Random import qualified Data.Text as TS import qualified Data.Text as T -import qualified Data.Text.Lazy as TL import qualified Data.Text.Encoding as TE -import qualified Data.Text.Lazy.Encoding as TLE import qualified Crypto.Hash.MD5 as H import Data.ByteString.Base16 as B16 import Data.Text.Encoding (encodeUtf8, decodeUtf8With)