servant-client-ghcjs: Fix performRequest function
Fix performRequest function to be compatible with the latest servant-client-core RunClient typeclass
This commit is contained in:
parent
3158809631
commit
17b55634b3
2 changed files with 18 additions and 5 deletions
10
changelog.d/1529
Normal file
10
changelog.d/1529
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
synopsis: Fix performRequest in servant-client-ghcjs
|
||||||
|
prs: #1529
|
||||||
|
|
||||||
|
description: {
|
||||||
|
|
||||||
|
performRequest function in servant-client-ghcjs was not compatible with the
|
||||||
|
latest RunClient typeclass. Added the acceptStatus parameter and fixed the
|
||||||
|
functionality to match what servant-client provides.
|
||||||
|
|
||||||
|
}
|
|
@ -120,7 +120,7 @@ instance Exception StreamingNotSupportedException where
|
||||||
displayException _ = "streamingRequest: streaming is not supported!"
|
displayException _ = "streamingRequest: streaming is not supported!"
|
||||||
|
|
||||||
instance RunClient ClientM where
|
instance RunClient ClientM where
|
||||||
runRequest = performRequest
|
runRequestAcceptStatus = performRequest
|
||||||
throwClientError = throwError
|
throwClientError = throwError
|
||||||
|
|
||||||
runClientMOrigin :: ClientM a -> ClientEnv -> IO (Either ClientError a)
|
runClientMOrigin :: ClientM a -> ClientEnv -> IO (Either ClientError a)
|
||||||
|
@ -152,15 +152,18 @@ runClientM m = do
|
||||||
|
|
||||||
runClientMOrigin m (ClientEnv (BaseUrl protocol hostname port ""))
|
runClientMOrigin m (ClientEnv (BaseUrl protocol hostname port ""))
|
||||||
|
|
||||||
performRequest :: Request -> ClientM Response
|
performRequest :: Maybe [Status] -> Request -> ClientM Response
|
||||||
performRequest req = do
|
performRequest acceptStatus req = do
|
||||||
xhr <- liftIO initXhr
|
xhr <- liftIO initXhr
|
||||||
burl <- asks baseUrl
|
burl <- asks baseUrl
|
||||||
liftIO $ performXhr xhr burl req
|
liftIO $ performXhr xhr burl req
|
||||||
resp <- toResponse xhr
|
resp <- toResponse xhr
|
||||||
|
|
||||||
let status = statusCode (responseStatusCode resp)
|
let status = responseStatusCode resp
|
||||||
unless (status >= 200 && status < 300) $ do
|
goodStatus = case acceptStatus of
|
||||||
|
Nothing -> statusIsSuccessful status
|
||||||
|
Just good -> status `elem` good
|
||||||
|
unless goodStatus $ do
|
||||||
let f b = (burl, BL.toStrict $ toLazyByteString b)
|
let f b = (burl, BL.toStrict $ toLazyByteString b)
|
||||||
throwError $ FailureResponse (bimap (const ()) f req) resp
|
throwError $ FailureResponse (bimap (const ()) f req) resp
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue