fix default content-type header of JSON requests was wrong

sunny-chung · Feb 16, 2024 · 1ada71c · 1ada71c
1 parent 36092d6
commit 1ada71c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...unnychung/application/multiplatform/hellohttp/extension/UserRequestConversionExtension.kt b/...unnychung/application/multiplatform/hellohttp/extension/UserRequestConversionExtension.kt
@@ -29,6 +29,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder
+import org.apache.hc.core5.http.ContentType
 import org.apache.hc.core5.http.message.BasicNameValuePair
 import org.apache.hc.core5.http.nio.AsyncRequestProducer
 import org.apache.hc.core5.http.nio.entity.AsyncEntityProducers
@@ -215,7 +216,13 @@ fun HttpRequest.toApacheHttpRequest(): Pair<AsyncRequestProducer, Long> {
                 *(entity.trailers?.get()?.toTypedArray() ?: emptyArray())
             )
         }
-        is StringBody -> AsyncEntityProducers.create(body.value, Charsets.UTF_8)
+
+        is StringBody -> AsyncEntityProducers.create(
+            /* content = */ body.value,
+            /* contentType = */ contentType.headerValue?.let { ContentType.create(it, Charsets.UTF_8) }
+                ?: ContentType.DEFAULT_BINARY.withCharset(Charsets.UTF_8)
+        )
+
         null -> null
         else -> throw UnsupportedOperationException()
     }