Decode URL manually - otherwise encoded commas get double-encoded

jvmusin · Feb 28, 2024 · ec0936a · ec0936a
1 parent 31b3590
commit ec0936a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/kotlin/io/github/jvmusin/polybacs/sybon/api/SybonApiFactory.kt b/src/main/kotlin/io/github/jvmusin/polybacs/sybon/api/SybonApiFactory.kt
@@ -8,6 +8,7 @@ import org.springframework.web.reactive.function.client.support.WebClientAdapter
 import org.springframework.web.service.invoker.HttpServiceProxyFactory
 import org.springframework.web.service.invoker.createClient
 import org.springframework.web.util.UriComponentsBuilder
+import java.net.URLDecoder
 
 @Component
 class SybonApiFactory(
@@ -17,7 +18,11 @@ class SybonApiFactory(
     private inline fun <reified T : Any> createApi(): T {
         val webClientBuilder = WebClient.builder()
             .filter { request, next ->
-                val newUri = UriComponentsBuilder.fromUri(request.url()).queryParam("api_key", apiKey).build().toUri()
+                val initialUrl = URLDecoder.decode(request.url().toString(), Charsets.UTF_8)
+                val newUri = UriComponentsBuilder.fromUriString(initialUrl)
+                    .queryParam("api_key", apiKey)
+                    .build()
+                    .toUri()
                 val newRequest = ClientRequest.from(request).url(newUri).build()
                 next.exchange(newRequest)
             }.codecs {