[refactor] upgrade to servant-client 0.20

openalex.cabal

@@ -76,8 +76,8 @@ library
       , http-conduit >= 2.3.8.1 && < 2.4
       , scientific >= 0.3.7 && < 0.4
       , servant >= 0.19 && < 0.21
-      , servant-client >= 0.19 && < 0.20
-      , servant-client-core >= 0.19 && < 0.21
+      , servant-client >= 0.20 && < 0.21
+      , servant-client-core >= 0.20 && < 0.21
       , text >= 2.0 && < 3
       , time >= 1.9.3 && < 1.13
       , vector >= 0.12.3 && < 0.14

src/OpenAlex.hs

@@ -35,9 +35,9 @@ defaultClientEnv :: IO ClientEnv
 defaultClientEnv = do
   manager <- newManager tlsManagerSettings
   let env' = mkClientEnv manager $ BaseUrl Https (T.unpack apiUrl) 443 ""
-  let makeClientRequest bu req =
-        let r = defaultMakeClientRequest bu req in
-        r { requestHeaders = (requestHeaders r) <> [("User-Agent", "servant.client")]}
+  let makeClientRequest bu req = do
+        r <- defaultMakeClientRequest bu req
+        pure $ r { requestHeaders = (requestHeaders r) <> [("User-Agent", "servant.client")]}
   let env = env' { makeClientRequest }
   pure $ addLoggingToClientEnv env
 

src/OpenAlex/ServantClientLogging.hs

@@ -13,7 +13,7 @@ Portability : POSIX
 
 module OpenAlex.ServantClientLogging where
 
-import qualified Data.Binary.Builder as DBB
+import Data.Binary.Builder qualified as DBB
 import Debug.Trace (trace)
 import Protolude hiding (trace)
 import Servant.Client (ClientEnv(..))
@@ -27,3 +27,6 @@ addLoggingToClientEnv env@(ClientEnv { makeClientRequest = mcr }) = env { makeCl
       trace ("req: " <> showRequestPath req <> " " <> show (requestQueryString req)) $ mcr baseUrl req
     showRequestPath req =
       show $ DBB.toLazyByteString $ requestPath req
+
+
+