From 898e7ed11ab0958fcdaf65b99b33f7b04787630a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 24 Sep 2017 22:14:48 +0200
Subject: Bootstrap with GHCJS and reflex:

- setup login and logout,
- first draft of payment view.
---
 src/server/Secure.hs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/server/Secure.hs')

diff --git a/src/server/Secure.hs b/src/server/Secure.hs
index da48878..f427304 100644
--- a/src/server/Secure.hs
+++ b/src/server/Secure.hs
@@ -11,11 +11,12 @@ import Data.Text.Lazy (fromStrict)
 import Network.HTTP.Types.Status (forbidden403)
 import Web.Scotty
 
-import Model.Message (getMessage)
+import qualified Common.Message as Message
+import qualified Common.Message.Key as Key
+import Common.Model (User)
+
 import Model.Query (Query)
-import Model.User (User)
 import qualified LoginSession
-import qualified Model.Message.Key as Key
 import qualified Model.Query as Query
 import qualified Model.SignIn as SignIn
 import qualified Model.User as User
@@ -31,16 +32,16 @@ loggedAction action = do
           action user
         Nothing -> do
           status forbidden403
-          html . fromStrict . getMessage $ Key.UnauthorizedSignIn
+          html . fromStrict . Message.get $ Key.Secure_Unauthorized
     Nothing -> do
       status forbidden403
-      html . fromStrict . getMessage $ Key.Forbidden
+      html . fromStrict . Message.get $ Key.Secure_Forbidden
 
 getUserFromToken :: Text -> Query (Maybe User)
 getUserFromToken token = do
   mbSignIn <- SignIn.getSignIn token
   case mbSignIn of
     Just signIn ->
-      User.getUser (SignIn.email signIn)
+      User.get (SignIn.email signIn)
     Nothing ->
       return Nothing
-- 
cgit v1.2.3


From 27e11b20b06f2f2dbfb56c0998a63169b4b8abc4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 8 Nov 2017 23:47:26 +0100
Subject: Use a better project structure

---
 src/server/Secure.hs | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 src/server/Secure.hs

(limited to 'src/server/Secure.hs')

diff --git a/src/server/Secure.hs b/src/server/Secure.hs
deleted file mode 100644
index f427304..0000000
--- a/src/server/Secure.hs
+++ /dev/null
@@ -1,47 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module Secure
-  ( loggedAction
-  , getUserFromToken
-  ) where
-
-import Control.Monad.IO.Class (liftIO)
-import Data.Text (Text)
-import Data.Text.Lazy (fromStrict)
-import Network.HTTP.Types.Status (forbidden403)
-import Web.Scotty
-
-import qualified Common.Message as Message
-import qualified Common.Message.Key as Key
-import Common.Model (User)
-
-import Model.Query (Query)
-import qualified LoginSession
-import qualified Model.Query as Query
-import qualified Model.SignIn as SignIn
-import qualified Model.User as User
-
-loggedAction :: (User -> ActionM ()) -> ActionM ()
-loggedAction action = do
-  maybeToken <- LoginSession.get
-  case maybeToken of
-    Just token -> do
-      maybeUser <- liftIO . Query.run . getUserFromToken $ token
-      case maybeUser of
-        Just user ->
-          action user
-        Nothing -> do
-          status forbidden403
-          html . fromStrict . Message.get $ Key.Secure_Unauthorized
-    Nothing -> do
-      status forbidden403
-      html . fromStrict . Message.get $ Key.Secure_Forbidden
-
-getUserFromToken :: Text -> Query (Maybe User)
-getUserFromToken token = do
-  mbSignIn <- SignIn.getSignIn token
-  case mbSignIn of
-    Just signIn ->
-      User.get (SignIn.email signIn)
-    Nothing ->
-      return Nothing
-- 
cgit v1.2.3