eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check for correct content-type in result.

Browse source
This commit is contained in:
Timo von Holtz 2015-02-17 10:55:35 +11:00
parent db2c5a42b2
commit e6e67b275b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Servant/Common/Req.hs
View file

@ -142,7 +142,9 @@ performRequest reqMethod req isWantedStatus reqHost = do
performRequestJSON :: FromJSON result => performRequestJSON :: FromJSON result =>
Method -> Req -> Int -> BaseUrl -> EitherT String IO result Method -> Req -> Int -> BaseUrl -> EitherT String IO result
performRequestJSON reqMethod req wantedStatus reqHost = do performRequestJSON reqMethod req wantedStatus reqHost = do
(_status, respBody, _) <- performRequest reqMethod req (== wantedStatus) reqHost (_status, respBody, contentType) <- performRequest reqMethod req (== wantedStatus) reqHost
unless (matches contentType ("application"//"json")) $
left $ "requested Content-Type application/json, but got " <> show contentType
either either
(\ message -> left (displayHttpRequest reqMethod ++ " returned invalid json: " ++ message)) (\ message -> left (displayHttpRequest reqMethod ++ " returned invalid json: " ++ message))
return return