replace form-data by form-urlencoded (#171)

PrestaShopCorp · May 22, 2023 · cd19629 · cd19629
1 parent b6b1e2c
commit cd19629
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 642 deletions.
diff --git a/src/Api/CollectorApiClient.php b/src/Api/CollectorApiClient.php
@@ -3,9 +3,6 @@
 namespace PrestaShop\Module\PsEventbus\Api;
 
 use GuzzleHttp\Psr7\Request;
-use PrestaShop\Module\PsEventbus\Api\Post\MultipartBody;
-use PrestaShop\Module\PsEventbus\Api\Post\PostFileApi;
-use PrestaShop\Module\PsEventbus\Config\Config;
 use Prestashop\ModuleLibGuzzleAdapter\ClientFactory;
 use Prestashop\ModuleLibGuzzleAdapter\Interfaces\HttpClientInterface;
 use PrestaShop\PsAccountsInstaller\Installer\Facade\PsAccounts;
@@ -72,20 +69,18 @@ public function upload(string $jobId, string $data, int $startTime, bool $fullSy
     {
         $url = $this->collectorApiUrl . '/upload/' . $jobId;
         // Prepare request
-        $file = new PostFileApi('file', $data, 'file');
-        $multipartBody = new MultipartBody([], [$file], Config::COLLECTOR_MULTIPART_BOUNDARY);
         $request = new Request(
             'POST',
             $url,
             [
                 'Accept' => 'application/json',
                 'Authorization' => 'Bearer ' . $this->jwt,
-                'Content-Length' => $file->getContent()->getSize(),
-                'Content-Type' => 'multipart/form-data; boundary=' . Config::COLLECTOR_MULTIPART_BOUNDARY,
+                'Content-Length' => strlen($data),
+                'Content-Type' => 'application/x-www-form-urlencoded',
                 'Full-Sync-Requested' => $fullSyncRequested ? '1' : '0',
                 'User-Agent' => 'ps-eventbus/' . $this->module->version,
             ],
-            $multipartBody->getContents()
+            'lines=' . urlencode($data)
         );
 
         // Send request and parse response
@@ -114,19 +109,17 @@ public function uploadDelete(string $jobId, string $data, int $startTime)
     {
         $url = $this->collectorApiUrl . '/delete/' . $jobId;
         // Prepare request
-        $file = new PostFileApi('file', $data, 'file');
-        $multipartBody = new MultipartBody([], [$file], Config::COLLECTOR_MULTIPART_BOUNDARY);
         $request = new Request(
             'POST',
             $url,
             [
                 'Accept' => 'application/json',
                 'Authorization' => 'Bearer ' . $this->jwt,
-                'Content-Length' => $file->getContent()->getSize(),
-                'Content-Type' => 'multipart/form-data; boundary=' . Config::COLLECTOR_MULTIPART_BOUNDARY,
+                'Content-Length' => strlen($data),
+                'Content-Type' => 'application/x-www-form-urlencoded',
                 'User-Agent' => 'ps-eventbus/' . $this->module->version,
             ],
-            $multipartBody->getContents()
+            'lines=' . urlencode($data)
         );
 
         // Send request and parse response

diff --git a/src/Api/Post/MultipartBody.php b/src/Api/Post/MultipartBody.php
diff --git a/src/Api/Post/PostFileApi.php b/src/Api/Post/PostFileApi.php
diff --git a/src/Api/Post/PostFileInterface.php b/src/Api/Post/PostFileInterface.php