haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utf8-string -> text

Browse Source
This commit is contained in:
Michael Snoyman 2010-10-26 09:45:16 +02:00
parent 881ea26d83
commit b1e405beb8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Yesod/Helpers/Auth/Email.hs
View File

@ -13,7 +13,8 @@ import System.Random
import Control.Monad (when) import Control.Monad (when)
import Control.Applicative ((<$>), (<*>)) import Control.Applicative ((<$>), (<*>))
import Data.Digest.Pure.MD5 import Data.Digest.Pure.MD5
import qualified Data.ByteString.Lazy.UTF8 as LU import qualified Data.Text.Lazy as T
import Data.Text.Lazy.Encoding (encodeUtf8)
login, register, setpass :: AuthRoute login, register, setpass :: AuthRoute
login = PluginR "email" ["login"] login = PluginR "email" ["login"]
@ -239,7 +240,10 @@ saltPass pass = do
return $ saltPass' salt pass return $ saltPass' salt pass
saltPass' :: String -> String -> String saltPass' :: String -> String -> String
saltPass' salt pass = salt ++ show (md5 $ LU.fromString $ salt ++ pass) saltPass' salt pass =
salt ++ show (md5 $ fromString $ salt ++ pass)
where
fromString = encodeUtf8 . T.pack
isValidPass :: String -- ^ cleartext password isValidPass :: String -- ^ cleartext password
-> SaltedPass -- ^ salted password -> SaltedPass -- ^ salted password

2
yesod-auth.cabal
View File

@ -22,7 +22,7 @@ library
, random >= 1.0 && < 1.1 , random >= 1.0 && < 1.1
, data-object >= 0.3.1.3 && < 0.4 , data-object >= 0.3.1.3 && < 0.4
, control-monad-attempt >= 0.3.0 && < 0.4 , control-monad-attempt >= 0.3.0 && < 0.4
, utf8-string >= 0.3.4 && < 0.4 , text >= 0.7 && < 0.11
, blaze-builder >= 0.1 && < 0.2 , blaze-builder >= 0.1 && < 0.2
, mime-mail >= 0.0 && < 0.1 , mime-mail >= 0.0 && < 0.1
exposed-modules: Yesod.Helpers.Auth exposed-modules: Yesod.Helpers.Auth