Tidy up postgrest function body
This commit is contained in:
@@ -80,18 +80,17 @@ postgrest conf refDbStructure pool getTime =
|
|||||||
body <- strictRequestBody req
|
body <- strictRequestBody req
|
||||||
dbStructure <- readIORef refDbStructure
|
dbStructure <- readIORef refDbStructure
|
||||||
|
|
||||||
case userApiRequest (configSchema conf) req body of
|
response <- case userApiRequest (configSchema conf) req body of
|
||||||
Left err -> respond $ apiRequestErrResponse err
|
Left err -> return $ apiRequestErrResponse err
|
||||||
Right apiRequest -> do
|
Right apiRequest -> do
|
||||||
let eClaims = jwtClaims
|
let jwtSecret = secret <$> configJwtSecret conf
|
||||||
(secret <$> configJwtSecret conf) (iJWT apiRequest) time
|
eClaims = jwtClaims jwtSecret (iJWT apiRequest) time
|
||||||
authed = containsRole eClaims
|
authed = containsRole eClaims
|
||||||
handleReq = runWithClaims conf eClaims (app dbStructure conf) apiRequest
|
handleReq = runWithClaims conf eClaims (app dbStructure conf) apiRequest
|
||||||
txMode = transactionMode $ iAction apiRequest
|
txMode = transactionMode $ iAction apiRequest
|
||||||
|
response <- P.use pool $ HT.run handleReq HT.ReadCommitted txMode
|
||||||
resp <- either (pgErrResponse authed) id <$> P.use pool
|
return $ either (pgErrResponse authed) identity response
|
||||||
(HT.run handleReq HT.ReadCommitted txMode)
|
respond response
|
||||||
respond resp
|
|
||||||
|
|
||||||
transactionMode :: Action -> H.Mode
|
transactionMode :: Action -> H.Mode
|
||||||
transactionMode ActionRead = HT.Read
|
transactionMode ActionRead = HT.Read
|
||||||
|
|||||||
Reference in New Issue
Block a user