MasseR/ebook-manager
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Mats Rauhala 2018-08-28 22:24:54 +03:00
parent 526a2e7ebc
commit 8d8b4e0453
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/Books.hs
View File

@ -55,7 +55,7 @@ instance FromJSON JsonBook
instance ToJSON PostBook instance ToJSON PostBook
instance FromJSON PostBook instance FromJSON PostBook
type API = Auth '[SA.BasicAuth, SA.JWT] SafeUser :> BaseAPI type API = Auth '[TokenCheck, SA.BasicAuth, SA.JWT] SafeUser :> BaseAPI
type BaseAPI = "books" :> Get '[JSON] [JsonBook] type BaseAPI = "books" :> Get '[JSON] [JsonBook]
:<|> "books" :> ReqBody '[JSON] PostBook :> Post '[JSON] JsonBook :<|> "books" :> ReqBody '[JSON] PostBook :> Post '[JSON] JsonBook

4
src/Server/Auth.hs
View File

@ -6,10 +6,12 @@
{-# Language DuplicateRecordFields #-} {-# Language DuplicateRecordFields #-}
{-# Language TypeApplications #-} {-# Language TypeApplications #-}
{-# Language TemplateHaskell #-} {-# Language TemplateHaskell #-}
{-# Language FlexibleContexts #-}
module Server.Auth module Server.Auth
( SafeUser(..) ( SafeUser(..)
, authCheck , authCheck
, AuthResult(..) , AuthResult(..)
, TokenCheck
, requireLoggedIn) , requireLoggedIn)
where where
@ -56,3 +58,5 @@ authCheck app (BasicAuthData username password) = flip runReaderT app $
requireLoggedIn :: (MonadLogger m, MonadThrow m, Monad m) => (SafeUser -> m a) -> AuthResult SafeUser -> m a requireLoggedIn :: (MonadLogger m, MonadThrow m, Monad m) => (SafeUser -> m a) -> AuthResult SafeUser -> m a
requireLoggedIn f (Authenticated user) = f user requireLoggedIn f (Authenticated user) = f user
requireLoggedIn _ u = $logError (pack (show u)) >> throwM err401 requireLoggedIn _ u = $logError (pack (show u)) >> throwM err401
data TokenCheck