aiohttp multipart/form-data fix applied to corehttp

sdk/core/corehttp/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+## 1.0.0b2 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+- Fixed an issue with `multipart/form-data` in the async transport where `data` was not getting encoded into the request body. #32473
+
+### Other Changes
+
 ## 1.0.0b1 (2023-10-18)
 
 * Initial Release

sdk/core/corehttp/corehttp/_version.py

@@ -9,4 +9,4 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.0.0b1"
+VERSION = "1.0.0b2"

sdk/core/corehttp/corehttp/transport/aiohttp/_aiohttp.py

@@ -136,7 +136,7 @@ def _get_request_data(self, request: RestHttpRequest):
         :return: The request data
         """
         if request._files:  # pylint: disable=protected-access
-            form_data = aiohttp.FormData()
+            form_data = aiohttp.FormData(request._data or {})  # pylint: disable=protected-access
             for form_file, data in request._files.items():  # pylint: disable=protected-access
                 content_type = data[2] if len(data) > 2 else None
                 try:

sdk/core/corehttp/tests/async_tests/test_rest_http_response_async.py

@@ -6,6 +6,7 @@
 
 # NOTE: These tests are heavily inspired from the httpx test suite: https://github.com/encode/httpx/tree/master/tests
 # Thank you httpx for your wonderful tests!
+import io
 import pytest
 
 from corehttp.rest import HttpRequest, AsyncHttpResponse
@@ -220,14 +221,25 @@ async def test_urlencoded_content(send_request):
     )
 
 
-# @pytest.mark.asyncio
-# async def test_multipart_files_content(send_request):
-#     request = HttpRequest(
-#         "POST",
-#         "/multipart/basic",
-#         files={"fileContent": io.BytesIO(b"<file content>")},
-#     )
-#     await send_request(request)
+@pytest.mark.asyncio
+async def test_multipart_files_content(send_request):
+    request = HttpRequest(
+        "POST",
+        "/multipart/basic",
+        files={"fileContent": io.BytesIO(b"<file content>")},
+    )
+    await send_request(request)
+
+
+@pytest.mark.asyncio
+async def test_multipart_data_and_files_content(send_request):
+    request = HttpRequest(
+        "POST",
+        "/multipart/data-and-files",
+        data={"message": "Hello, world!"},
+        files={"fileContent": io.BytesIO(b"<file content>")},
+    )
+    await send_request(request)
 
 
 @pytest.mark.asyncio

sdk/core/corehttp/tests/testserver_tests/coretestserver/coretestserver/test_routes/multipart.py

@@ -25,7 +25,7 @@ def basic():
     assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
     if request.files:
         # aiohttp
-        assert_with_message("content length", 258, request.content_length)
+        assert_with_message("content length", 228, request.content_length)
         assert_with_message("num files", 1, len(request.files))
         assert_with_message("has file named fileContent", True, bool(request.files.get("fileContent")))
         file_content = request.files["fileContent"]
@@ -37,7 +37,7 @@ def basic():
         )
         assert_with_message(
             "content disposition",
-            'form-data; name="fileContent"; filename="fileContent"; filename*=utf-8\'\'fileContent',
+            'form-data; name="fileContent"; filename="fileContent"',
             file_content.headers["Content-Disposition"],
         )
     elif request.form:
@@ -51,9 +51,30 @@ def basic():
 
 @multipart_api.route("/data-and-files", methods=["POST"])
 def data_and_files():
-    assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
-    assert_with_message("message", "Hello, world!", request.form["message"])
-    assert_with_message("message", "<file content>", request.form["fileContent"])
+    if request.files:
+        # aiohttp
+        assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
+        assert_with_message("has file named fileContent", True, bool(request.files.get("fileContent")))
+        assert_with_message("message", "Hello, world!", request.form["message"])
+        file_content = request.files["fileContent"]
+        assert_with_message("file content type", "application/octet-stream", file_content.content_type)
+        assert_with_message("file content length", 14, file_content.content_length)
+        assert_with_message("filename", "fileContent", file_content.filename)
+        assert_with_message(
+            "has content disposition header", True, bool(file_content.headers.get("Content-Disposition"))
+        )
+        assert_with_message(
+            "content disposition",
+            'form-data; name="fileContent"; filename="fileContent"',
+            file_content.headers["Content-Disposition"],
+        )
+    elif request.form:
+        # requests
+        assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
+        assert_with_message("message", "Hello, world!", request.form["message"])
+        assert_with_message("message", "<file content>", request.form["fileContent"])
+    else:
+        return Response(status=400)
     return Response(status=200)