From 33b85b7f12798f5762d940ed5c30f775cdd7b751 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 28 Jan 2018 12:13:09 +0100
Subject: WIP

---
 server/src/Controller/Index.hs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'server/src/Controller/Index.hs')

diff --git a/server/src/Controller/Index.hs b/server/src/Controller/Index.hs
index 9a3e2b7..f942540 100644
--- a/server/src/Controller/Index.hs
+++ b/server/src/Controller/Index.hs
@@ -23,11 +23,11 @@ import qualified Common.Msg                as Msg
 
 import           Conf                      (Conf (..))
 import qualified LoginSession
-import           Model.Init                (getInit)
 import qualified Model.Query               as Query
 import qualified Model.SignIn              as SignIn
-import qualified Model.User                as User
-import           Secure                    (getUserFromToken)
+import qualified Persistence.Init          as InitPersistence
+import qualified Persistence.User          as UserPersistence
+import qualified Secure
 import qualified SendMail
 import qualified Text.Email.Validate       as Email
 import qualified View.Mail.SignIn          as SignIn
@@ -39,16 +39,16 @@ get conf = do
     mbLoggedUser <- getLoggedUser
     case mbLoggedUser of
       Nothing ->
-        return . InitEmpty . Right $ Nothing
+        return InitEmpty
       Just user ->
-        liftIO . Query.run . fmap InitSuccess $ getInit user conf
+        liftIO . Query.run . fmap InitSuccess $ InitPersistence.getInit user conf
   S.html $ page initResult
 
 askSignIn :: Conf -> SignIn -> ActionM ()
 askSignIn conf (SignIn email) =
   if Email.isValid (TE.encodeUtf8 email)
     then do
-      maybeUser <- liftIO . Query.run $ User.get email
+      maybeUser <- liftIO . Query.run $ UserPersistence.get email
       case maybeUser of
         Just user -> do
           token <- liftIO . Query.run $ SignIn.createSignInToken email
@@ -71,7 +71,7 @@ trySignIn conf token = do
   userOrError <- validateSignIn conf token
   case userOrError of
     Left errorKey ->
-      S.html $ page (InitEmpty . Left . Msg.get $ errorKey)
+      S.html $ page (InitError $ Msg.get errorKey)
     Right _ ->
       S.redirect "/"
 
@@ -100,7 +100,7 @@ validateSignIn conf textToken = do
                       LoginSession.put conf (SignIn.token signIn)
                       mbUser <- liftIO . Query.run $ do
                         SignIn.signInTokenToUsed . SignIn.id $ signIn
-                        User.get . SignIn.email $ signIn
+                        UserPersistence.get . SignIn.email $ signIn
                       return $ case mbUser of
                         Nothing   -> Left Msg.Secure_Unauthorized
                         Just user -> Right user
@@ -112,7 +112,7 @@ getLoggedUser = do
     Nothing ->
       return Nothing
     Just token -> do
-      liftIO . Query.run . getUserFromToken $ token
+      liftIO . Query.run . Secure.getUserFromToken $ token
 
 signOut :: Conf -> ActionM ()
 signOut conf = LoginSession.delete conf >> S.status ok200
-- 
cgit v1.2.3