fix: json encode for live sync (#409)

PrestaShopCorp · Feb 4, 2025 · 000895c · 000895c
1 parent b9abf26
commit 000895c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 72 deletions.
diff --git a/src/Api/CloudSyncClient.php b/src/Api/CloudSyncClient.php
@@ -26,7 +26,6 @@
 
 namespace PrestaShop\Module\PsEventbus\Api;
 
-use PrestaShop\Module\PsEventbus\Formatter\JsonFormatter;
 use PrestaShop\Module\PsEventbus\Service\PsAccountsAdapterService;
 
 if (!defined('_PS_VERSION_')) {
@@ -60,11 +59,6 @@ class CloudSyncClient
      */
     private $module;
 
-    /**
-     * @var JsonFormatter
-     */
-    private $jsonFormatter;
-
     /**
      * Accounts JSON Web token
      *
@@ -94,20 +88,17 @@ class CloudSyncClient
      * @param string $syncApiUrl
      * @param \Ps_eventbus $module
      * @param PsAccountsAdapterService $psAccountsAdapterService
-     * @param JsonFormatter $jsonFormatter
      */
     public function __construct(
         $collectorApiUrl,
         $liveSyncApiUrl,
         $syncApiUrl,
         \Ps_eventbus $module,
-        PsAccountsAdapterService $psAccountsAdapterService,
-        JsonFormatter $jsonFormatter
+        PsAccountsAdapterService $psAccountsAdapterService
     ) {
         $this->module = $module;
         $this->jwt = $psAccountsAdapterService->getOrRefreshToken();
         $this->shopId = $psAccountsAdapterService->getShopUuid();
-        $this->jsonFormatter = $jsonFormatter;
 
         $this->collectorApiUrl = $collectorApiUrl;
         $this->liveSyncApiUrl = $liveSyncApiUrl;
@@ -141,7 +132,7 @@ public function upload($jobId, $data, $startTime, $fullSyncRequested = null)
                 'Full-Sync-Requested' => $fullSyncRequested ? '1' : '0',
                 'User-Agent' => 'ps-eventbus/' . $this->module->version,
             ],
-            $this->jsonFormatter->formatNewlineJsonString($data),
+            $data,
             true
         );
 
@@ -172,7 +163,10 @@ public function liveSync($shopContent, $action)
                 'User-Agent' => 'ps-eventbus/' . $this->module->version,
                 'Content-Type' => 'application/json',
             ],
-            '{"shopContents": ["' . $kebabCasedShopContent . '"], "action": "' . $action . '"}'
+            [
+                'shopContents' => [$kebabCasedShopContent],
+                'action' => $action,
+            ]
         );
 
         return [

diff --git a/src/Api/HttpClient.php b/src/Api/HttpClient.php
@@ -205,6 +205,22 @@ private function init()
         return $this;
     }
 
+    /**
+     * @param array<mixed> $data
+     *
+     * @return string
+     */
+    private function formatNewlineJsonString($data)
+    {
+        $jsonArray = array_map(function ($dataItem) {
+            return json_encode($dataItem, JSON_UNESCAPED_SLASHES);
+        }, $data);
+
+        $json = implode("\r\n", $jsonArray);
+
+        return str_replace('\\u0000', '', $json);
+    }
+
     /**
      * Set the timeout for the current request.
      *
@@ -355,12 +371,12 @@ public function get($url, $headers, $data = null)
      *
      * @param string $url The url to make the post request
      * @param array $headers Optional headers to pass to the url
-     * @param array|object|string $data Post data to pass to the url
+     * @param array $data Post data to pass to the url
      * @param bool $isFile If there is a multipart, set it to true or False if it is a json
      *
      * @return self
      */
-    public function post($url, $headers = null, $data = null, $isFile = null)
+    public function post($url, array $headers = [], array $data = [], $isFile = null)
     {
         if (is_null($isFile)) {
             $isFile = false;
@@ -372,7 +388,7 @@ public function post($url, $headers = null, $data = null, $isFile = null)
         if ($isFile) {
             // Créer un fichier temporaire
             $temp = tmpfile();
-            fwrite($temp, $data);
+            fwrite($temp, $this->formatNewlineJsonString($data));
             rewind($temp);
 
             // Sauvegarder le fichier temporaire pour cURL

diff --git a/src/Formatter/JsonFormatter.php b/src/Formatter/JsonFormatter.php
diff --git a/src/ServiceContainer/Provider/ApiProvider.php b/src/ServiceContainer/Provider/ApiProvider.php
@@ -21,7 +21,6 @@
 namespace PrestaShop\Module\PsEventbus\ServiceContainer\Provider;
 
 use PrestaShop\Module\PsEventbus\Api\CloudSyncClient;
-use PrestaShop\Module\PsEventbus\Formatter\JsonFormatter;
 use PrestaShop\Module\PsEventbus\Service\PsAccountsAdapterService;
 use PrestaShop\Module\PsEventbus\ServiceContainer\Contract\IServiceProvider;
 use PrestaShop\Module\PsEventbus\ServiceContainer\ServiceContainer;
@@ -41,8 +40,7 @@ public function provide(ServiceContainer $container)
                 $container->getParameter('ps_eventbus.live_sync_api_url'),
                 $container->getParameter('ps_eventbus.sync_api_url'),
                 $container->get('ps_eventbus.module'),
-                $container->get(PsAccountsAdapterService::class),
-                $container->get(JsonFormatter::class)
+                $container->get(PsAccountsAdapterService::class)
             );
         });
     }

diff --git a/src/ServiceContainer/Provider/CommonProvider.php b/src/ServiceContainer/Provider/CommonProvider.php
@@ -21,7 +21,6 @@
 namespace PrestaShop\Module\PsEventbus\ServiceContainer\Provider;
 
 use PrestaShop\Module\PsEventbus\Formatter\ArrayFormatter;
-use PrestaShop\Module\PsEventbus\Formatter\JsonFormatter;
 use PrestaShop\Module\PsEventbus\Handler\ErrorHandler\ErrorHandler;
 use PrestaShop\Module\PsEventbus\Helper\ModuleHelper;
 use PrestaShop\Module\PsEventbus\Service\PresenterService;
@@ -53,9 +52,6 @@ public function provide(ServiceContainer $container)
                 $container->get(ErrorHandler::class)
             );
         });
-        $container->registerProvider(JsonFormatter::class, static function () {
-            return new JsonFormatter();
-        });
         $container->registerProvider(ArrayFormatter::class, static function () {
             return new ArrayFormatter();
         });