feat: add compat with account v8 (#446)

Author: fox-john

src/Api/CloudSyncClient.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
@@ -97,7 +98,7 @@ public function __construct(
         PsAccountsAdapterService $psAccountsAdapterService
     ) {
         $this->module = $module;
-        $this->jwt = $psAccountsAdapterService->getOrRefreshToken();
+        $this->jwt = $psAccountsAdapterService->getShopToken();
         $this->shopId = $psAccountsAdapterService->getShopUuid();
 
         $this->collectorApiUrl = $collectorApiUrl;

src/Service/ApiAuthorizationService.php

@@ -81,7 +81,7 @@ public function authorize($jobId, $isHealthCheck)
             }
 
             try {
-                $token = $this->psAccountsAdapterService->getOrRefreshToken();
+                $token = $this->psAccountsAdapterService->getShopToken();
             } catch (\Exception $exception) {
                 throw new FirebaseException($exception->getMessage());
             }

src/Service/ApiHealthCheckService.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
@@ -103,7 +104,7 @@ public function getHealthCheck($jobId)
         $isAuthentified = $this->apiAuthorizationService->authorize($jobId, true);
 
         try {
-            $token = $this->psAccountsAdapterService->getOrRefreshToken();
+            $token = $this->psAccountsAdapterService->getShopToken();
             if ($token) {
                 $psAccount = \Module::getInstanceByName('ps_accounts');
 

src/Service/PresenterService.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
@@ -70,7 +71,7 @@ public function expose(\ModuleCore $module, $requiredConsents = [], $optionalCon
         }
 
         return [
-            'jwt' => $this->psAccountsAdapterService->getOrRefreshToken(),
+            'jwt' => $this->psAccountsAdapterService->getShopToken(),
             'requiredConsents' => $requiredConsents,
             'optionalConsents' => $optionalConsents,
             'module' => array_merge([

src/Service/PsAccountsAdapterService.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
@@ -76,7 +77,7 @@ public function getModule()
      *
      * @return mixed
      */
-    public function getService()
+    public function getAccountService()
     {
         if (!$this->moduleHelper->isInstalledAndActive('ps_accounts')) {
             return false;
@@ -94,42 +95,19 @@ public function getService()
         }
     }
 
-    /**
-     * Get presenter from psAccounts, or null if module is'nt ready
-     *
-     * @return mixed
-     */
-    public function getPresenter()
-    {
-        if (!$this->moduleHelper->isInstalledAndActive('ps_accounts') || !$this->getService()) {
-            return false;
-        }
-
-        try {
-            return $this->psAccountModule->getService('PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter');
-        } catch (\Exception $e) {
-            $this->errorHandler->handle(
-                new \PrestaShopException('Failed to load PsAccountsPresenter', 0, $e),
-                true
-            );
-
-            return false;
-        }
-    }
-
     /**
      * Get shopUuid from psAccounts, or null if module is'nt ready
      *
      * @return string
      */
     public function getShopUuid()
     {
-        if (!$this->moduleHelper->isInstalledAndActive('ps_accounts') || !$this->getService()) {
+        if (!$this->moduleHelper->isInstalledAndActive('ps_accounts') || !$this->getAccountService()) {
             return '';
         }
 
         try {
-            return $this->getService()->getShopUuid();
+            return $this->getAccountService()->getShopUuid();
         } catch (\Exception $e) {
             $this->errorHandler->handle(
                 new \PrestaShopException('Failed to get shop uuid from ps_account', 0, $e),
@@ -145,14 +123,22 @@ public function getShopUuid()
      *
      * @return string
      */
-    public function getOrRefreshToken()
+    public function getShopToken()
     {
-        if (!$this->moduleHelper->isInstalledAndActive('ps_accounts') || !$this->getService()) {
+        if (!$this->moduleHelper->isInstalledAndActive('ps_accounts') || !$this->getAccountService()) {
+            return '';
+        }
+
+        if ($this->psAccountModule == false) {
             return '';
         }
 
         try {
-            return $this->getService()->getOrRefreshToken();
+            if (version_compare($this->psAccountModule->version, '7.1.1', '>=')) {
+                return $this->getAccountService()->getShopToken();
+            } else {
+                return $this->getAccountService()->getOrRefreshToken();
+            }
         } catch (\Exception $e) {
             $this->errorHandler->handle(
                 new \PrestaShopException('Failed to get refresh token from ps_account', 0, $e),