do not ask for user id, it comes from auth anyway
This commit is contained in:
parent
f1518f4100
commit
3a5cb7c5ac
2 changed files with 5 additions and 13 deletions
|
@ -33,8 +33,7 @@ type MateAPI =
|
|||
:> ReqBody '[JSON] Int :> Delete '[JSON] ()
|
||||
|
||||
:<|> "user" :> ReqBody '[JSON] UserSubmit :> Post '[JSON] Int
|
||||
:<|> "user" :> AuthProtect "header-auth"
|
||||
:> Capture "uid'" Int :> Get '[JSON] UserDetails
|
||||
:<|> "user" :> AuthProtect "header-auth" :> Get '[JSON] UserDetails
|
||||
:<|> "user" :> AuthProtect "header-auth"
|
||||
:> ReqBody '[JSON] UserDetailsSubmit :> Patch '[JSON] ()
|
||||
:<|> "user" :> "list" :> QueryParam "refine" UserRefine :> Get '[JSON] [UserSummary]
|
||||
|
|
|
@ -32,21 +32,14 @@ userNew (UserSubmit ident email passhash) = do
|
|||
|
||||
userGet
|
||||
:: Maybe (Int, AuthMethod)
|
||||
-> Int
|
||||
-> MateHandler UserDetails
|
||||
userGet Nothing _ =
|
||||
userGet Nothing =
|
||||
throwError $ err401
|
||||
{ errBody = "No Authentication present."
|
||||
}
|
||||
userGet (Just (aid, method)) uid =
|
||||
if aid == uid && any (== method) [PrimaryPass, ChallengeResponse]
|
||||
then do
|
||||
userGet (Just (uid, _)) = do
|
||||
conn <- rsConnection <$> ask
|
||||
userDetailsSelect uid conn
|
||||
else
|
||||
throwError $ err401
|
||||
{ errBody = "Wrong Authentication present."
|
||||
}
|
||||
|
||||
userUpdate
|
||||
:: Maybe (Int, AuthMethod)
|
||||
|
|
Loading…
Reference in a new issue