KTOR-6911 Fix UnsupportedContentTypeException in SSE on OkHttp (#4020)

ktorio · Apr 12, 2024 · 5f27f30 · 5f27f30
1 parent 7c76fa7
commit 5f27f30
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/buildSrc/src/main/kotlin/test/server/tests/ServerSentEvents.kt b/buildSrc/src/main/kotlin/test/server/tests/ServerSentEvents.kt
@@ -77,6 +77,15 @@ internal fun Application.serverSentEvents() {
                     }
                 )
             }
+
+            post {
+                call.respondSseEvents(
+                    flow {
+                        emit(SseEvent("Hello"))
+                    }
+                )
+
+            }
         }
     }
 }

diff --git a/ktor-client/ktor-client-okhttp/jvm/src/io/ktor/client/engine/okhttp/OkHttpEngine.kt b/ktor-client/ktor-client-okhttp/jvm/src/io/ktor/client/engine/okhttp/OkHttpEngine.kt
@@ -221,7 +221,8 @@ internal fun OutgoingContent.convertToOkHttpBody(callContext: CoroutineContext):
         StreamRequestBody(contentLength) { GlobalScope.writer(callContext) { writeTo(channel) }.channel }
     }
     is OutgoingContent.NoContent -> ByteArray(0).toRequestBody(null, 0, 0)
-    else -> throw UnsupportedContentTypeException(this)
+    is OutgoingContent.ContentWrapper -> delegate().convertToOkHttpBody(callContext)
+    is OutgoingContent.ProtocolUpgrade -> throw UnsupportedContentTypeException(this)
 }
 
 /**

diff --git a/...client/ktor-client-tests/common/test/io/ktor/client/tests/plugins/ServerSentEventsTest.kt b/...client/ktor-client-tests/common/test/io/ktor/client/tests/plugins/ServerSentEventsTest.kt
@@ -376,4 +376,22 @@ class ServerSentEventsTest : ClientLoader(timeoutSeconds = 120) {
             }
         }
     }
+
+    @Test
+    fun testPostRequest() = clientTests {
+        config {
+            install(SSE)
+        }
+
+        test { client ->
+            client.sse({
+                url("$TEST_SERVER/sse")
+                method = HttpMethod.Post
+            }) {
+                incoming.single().apply {
+                    assertEquals("Hello", data)
+                }
+            }
+        }
+    }
 }