fix(multipart-form-param): fixes issue of sending multipart object pa…

…rams (#14)
apimatic · Oct 12, 2022 · 514093b · 514093b
1 parent 2d88d2c
commit 514093b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/Request/Parameters/FormParam.php b/src/Request/Parameters/FormParam.php
@@ -5,6 +5,7 @@
 namespace Core\Request\Parameters;
 
 use Core\Types\Sdk\CoreFileWrapper;
+use Core\Utils\CoreHelper;
 use CoreInterfaces\Core\Request\RequestArraySerialization;
 use CoreInterfaces\Core\Request\RequestSetterInterface;
 
@@ -57,6 +58,12 @@ public function plain(): self
         return $this;
     }
 
+    private function isMultipart(): bool
+    {
+        return isset($this->encodingHeaders['content-type']) &&
+            $this->encodingHeaders['content-type'] != 'application/x-www-form-urlencoded';
+    }
+
     /**
      * Adds the parameter to the request provided.
      *
@@ -77,6 +84,10 @@ public function apply(RequestSetterInterface $request): void
             return;
         }
         $this->value = $this->prepareValue($this->value);
+        if ($this->isMultipart()) {
+            $request->addMultipartFormParam($this->key, CoreHelper::serialize($this->value));
+            return;
+        }
         $encodedValue = $this->httpBuildQuery([$this->key => $this->value], $this->format);
         if (empty($encodedValue)) {
             return;

diff --git a/tests/ApiCallTest.php b/tests/ApiCallTest.php
@@ -326,13 +326,17 @@ public function testSendSingleForm()
         $this->assertEquals([], $result->body['parametersMultipart']);
     }
 
-    public function testSendFileForm()
+    public function testSendMultipartFormParameters()
     {
         $result = MockHelper::newApiCall()
             ->requestBuilder((new RequestBuilder(RequestMethod::POST, '/simple/{tyu}'))
-                ->parameters(FormParam::init('myFile', MockHelper::getFileWrapper())))
-            ->responseHandler(MockHelper::responseHandler()
-                ->type(MockClass::class))
+                ->parameters(
+                    FormParam::init('myFile', MockHelper::getFileWrapper())
+                        ->encodingHeader('content-type', 'image/png'),
+                    FormParam::init('object', new MockClass(["key" => 234]))
+                        ->encodingHeader('content-type', 'application/json')
+                ))
+            ->responseHandler(MockHelper::responseHandler()->type(MockClass::class))
             ->execute();
         $this->assertInstanceOf(MockClass::class, $result);
         $this->assertEquals([], $result->body['parametersEncoded']);
@@ -342,6 +346,8 @@ public function testSendFileForm()
         $this->assertEquals('text/plain', $file->getMimeType());
         $this->assertEquals('My Text', $file->getPostFilename());
         $this->assertEquals($file, $result->body['parameters']['myFile']);
+        $object = $result->body['parametersMultipart']['object'];
+        $this->assertEquals('{"body":{"key":234}}', $object);
     }
 
     public function testSendFileFormWithEncodingHeader()