From 16ac034aab0dbc02d4ad073bd57eb13a96a7a72f Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Sun, 27 Nov 2016 23:55:19 -0500 Subject: [PATCH] Tidy up postgrest function body --- src/PostgREST/App.hs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs index f26949deb..124155501 100644 --- a/src/PostgREST/App.hs +++ b/src/PostgREST/App.hs @@ -80,18 +80,17 @@ postgrest conf refDbStructure pool getTime = body <- strictRequestBody req dbStructure <- readIORef refDbStructure - case userApiRequest (configSchema conf) req body of - Left err -> respond $ apiRequestErrResponse err + response <- case userApiRequest (configSchema conf) req body of + Left err -> return $ apiRequestErrResponse err Right apiRequest -> do - let eClaims = jwtClaims - (secret <$> configJwtSecret conf) (iJWT apiRequest) time + let jwtSecret = secret <$> configJwtSecret conf + eClaims = jwtClaims jwtSecret (iJWT apiRequest) time authed = containsRole eClaims handleReq = runWithClaims conf eClaims (app dbStructure conf) apiRequest txMode = transactionMode $ iAction apiRequest - - resp <- either (pgErrResponse authed) id <$> P.use pool - (HT.run handleReq HT.ReadCommitted txMode) - respond resp + response <- P.use pool $ HT.run handleReq HT.ReadCommitted txMode + return $ either (pgErrResponse authed) identity response + respond response transactionMode :: Action -> H.Mode transactionMode ActionRead = HT.Read