[refactor] upgrade to servant-client 0.20

.gitignore

-dist-newstyle/
\ No newline at end of file
+dist-newstyle/
+.stack-work/
\ No newline at end of file

cabal.project

-with-compiler: ghc-9.4.7
+with-compiler: ghc-9.4.8
 
 packages:
         ./
@@ -11,5 +11,5 @@ source-repository-package
 allow-newer: base:*
            , iso639:aeson
            , iso639:text
-           , servant-client:servant
-           , servant-client:servant-client-core
+           -- , servant-client:servant
+           -- , servant-client:servant-client-core

epo-api-client.cabal

@@ -76,8 +76,8 @@ library
                     , iso639
                     , network-uri ^>= 2.6.4.2
                     , protolude >= 0.3.3 && < 0.4
-                    , servant >= 0.19.1 && < 0.21
-                    , servant-client >= 0.19 && < 0.20
+                    , servant >= 0.20 && < 0.21
+                    , servant-client >= 0.20 && < 0.21
                     , text >= 2.0 && < 3
                     
     -- Directories containing source files.

src/EPO/API/Client.hs

@@ -34,9 +34,9 @@ defaultClientEnv uri  = do
         else (readEither (T.unpack $ T.tail $ T.pack uriPort) :: Either [Char] Int)
   manager <- newManager managerSettings
   let env' = mkClientEnv manager $ BaseUrl proto uriRegName (fromRight 80 uriPort') ""
-  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
   pure env