diff --git a/src/Application.hs b/src/Application.hs index 623d702a8..cfa04f60a 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} - -module Application + +module Application ( getAppSettings, getAppDevSettings , appMain , develMain diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs index b47723cb4..386294b18 100644 --- a/test/Database/Fill.hs +++ b/test/Database/Fill.hs @@ -7,6 +7,8 @@ import "uniworx" Import hiding (Option(..), currentYear) import qualified Data.ByteString.Lazy as LBS -- import qualified Data.Text as Text +import qualified Data.Text.Encoding as TEnc +import qualified Yesod.Auth.Util.PasswordStore as PWStore -- import Data.Text.IO (hPutStrLn) import qualified Data.Set as Set @@ -133,9 +135,15 @@ fillDb = do , userSex = Just SexMale , userShowSex = userDefaultShowSex } + pwSimple <- do + let pw = "123.456" + PWHashConf{..} <- getsYesod $ view _appAuthPWHash + pwHash <- liftIO $ PWStore.makePasswordWith pwHashAlgorithm pw pwHashStrength + return $ AuthPWHash $ TEnc.decodeUtf8 pwHash jost <- insert User { userIdent = "jost@tcs.ifi.lmu.de" - , userAuthentication = AuthLDAP + -- , userAuthentication = AuthLDAP + , userAuthentication = pwSimple , userLastAuthentication = Nothing , userTokensIssuedAfter = Nothing , userMatrikelnummer = Nothing