diff options
| author | Joris | 2017-03-24 09:21:06 +0000 |
|---|---|---|
| committer | Joris | 2017-03-24 09:21:06 +0000 |
| commit | c0ac16a713c4e53cf6af8e72a6d5f6b8ac5d6456 (patch) | |
| tree | 8a438430cee7411259fc395d8f3898488e85d750 /src/server/Controller/User.hs | |
| parent | 293eb8295162bf0a038f488237db9c9d1316c04d (diff) | |
| parent | cfca18262c1ff48dcb683ddab7d03cf8e55573ff (diff) | |
Merge branch 'features/categories' into 'master'
Features/categories
See merge request !1
Diffstat (limited to 'src/server/Controller/User.hs')
| -rw-r--r-- | src/server/Controller/User.hs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/server/Controller/User.hs b/src/server/Controller/User.hs index 1baab18..d8604ac 100644 --- a/src/server/Controller/User.hs +++ b/src/server/Controller/User.hs @@ -2,7 +2,6 @@ module Controller.User ( getUsers - , whoAmI ) where import Web.Scotty @@ -12,16 +11,10 @@ import Control.Monad.IO.Class (liftIO) import qualified Secure import Model.Database -import qualified Model.User as U +import qualified Model.User as User getUsers :: ActionM () getUsers = Secure.loggedAction (\_ -> - (liftIO $ map U.getJsonUser <$> runDb U.getUsers) >>= json - ) - -whoAmI :: ActionM () -whoAmI = - Secure.loggedAction (\user -> - json (U.getJsonUser user) + (liftIO $ map User.getJsonUser <$> runDb User.list) >>= json ) |