Fix base URL bug in HTTP client

hexagontk · May 2, 2023 · a5ebce9 · a5ebce9
1 parent cde670a
commit a5ebce9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/http_client_jetty/src/main/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapter.kt b/http_client_jetty/src/main/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapter.kt
@@ -170,14 +170,15 @@ open class JettyClientAdapter : HttpClientPort {
         val settings = adapterHttpClient.settings
         val contentType = request.contentType ?: settings.contentType
         val authorization = request.authorization ?: settings.authorization
+        val baseUrl = settings.baseUrl
 
         if (settings.useCookies) {
-            val uri = (adapterHttpClient.settings.baseUrl ?: request.url()).toURI()
+            val uri = (baseUrl ?: request.url()).toURI()
             addCookies(uri, adapterJettyClient.cookieStore, request.cookies)
         }
 
         val jettyRequest = adapterJettyClient
-            .newRequest(URI(settings.baseUrl.toString() + request.path))
+            .newRequest(URI((baseUrl?.toString() ?: "") + request.path))
             .method(HttpMethod.valueOf(request.method.toString()))
             .headers {
                 it.remove("accept-encoding") // Don't send encoding by default

diff --git a/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt b/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt
@@ -192,6 +192,12 @@ abstract class ClientTest(
         assertEquals("qp=qpValue", getResponse.headers["query-parameters"]?.value)
         assertEquals("qp=qpValue", response.headers["query-parameters"]?.value)
         checkResponse(response, mapOf("body" to "payload"))
+
+        val base = client.settings.baseUrl?.toString()
+        HttpClient(clientAdapter(), client.settings.copy(baseUrl = null)).request {
+            val secondResponse = get("$base/queryParameters?qp=qpValue")
+            assertEquals("qp=qpValue", secondResponse.headers["query-parameters"]?.value)
+        }
     }
 
     @Test fun `HTTP methods without body work ok`() {

diff --git a/http_test/src/test/kotlin/com/hexagonkt/http/test/HelloWorldTest.kt b/http_test/src/test/kotlin/com/hexagonkt/http/test/HelloWorldTest.kt
@@ -37,7 +37,8 @@ fun main() {
 internal class HelloWorldTest {
 
     private val client: HttpClient by lazy {
-        HttpClient(JettyClientAdapter(), HttpClientSettings(URL("http://localhost:${server.runtimePort}")))
+        val settings = HttpClientSettings(URL("http://localhost:${server.runtimePort}"))
+        HttpClient(JettyClientAdapter(), settings)
     }
 
     @BeforeAll fun initialize() {