From 5ef59d7cc422fceb4f5643aca953f020e1215d4a Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Wed, 11 Aug 2021 19:02:02 +0200
Subject: [PATCH 01/30] feat: add public and private key when we create a new
 shop

---
 ps_accounts.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ps_accounts.php b/ps_accounts.php
index 6f64c68d0..c696b9fcc 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -273,6 +273,18 @@ public function hookActionObjectShopAddAfter($params)
             $this->switchConfigMultishopMode();
         }
 
+        $shopCreated = $params["object"];
+
+        /** @var \PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository $config */
+        $configuration = $this->getService(\PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository::class);
+        $actualShopId = $configuration->getShopId();
+        $configuration->setShopId($shopCreated->id);
+
+        /** @var \PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider $rsaKeyProvider */
+        $rsaKeyProvider = $this->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
+        $rsaKeyProvider->generateKeys();
+        $configuration->setShopId = $actualShopId;
+
         return true;
     }
 

From 2d9be767cfdd0449df811cb4206daf50288f7208 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Wed, 18 Aug 2021 09:47:42 +0200
Subject: [PATCH 02/30] add properties to presenter for multishop selection

* multishop, moduleName and psVersion keys on shop tree
* type of shop context and it's ID (group ID or shop ID)
---
 classes/Context/ShopContext.php           | 26 +++++++++++++++++++++++
 classes/Presenter/PsAccountsPresenter.php |  4 ++++
 classes/Provider/ShopProvider.php         |  8 ++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/classes/Context/ShopContext.php b/classes/Context/ShopContext.php
index a792258b3..6a17e3265 100644
--- a/classes/Context/ShopContext.php
+++ b/classes/Context/ShopContext.php
@@ -68,6 +68,32 @@ public function isShop173()
         return version_compare(_PS_VERSION_, '1.7.3.0', '>=');
     }
 
+    /**
+     * @return bool
+     */
+    public function getShopContext()
+    {
+        return \Shop::getContext();
+    }
+
+    /**
+     * ID of shop or group
+     *
+     * @return string | null
+     */
+    public function getShopContextId()
+    {
+        if (\Shop::getContext() == \Shop::CONTEXT_SHOP) {
+            return \Shop::getContextShopID();;
+        }
+
+        if (\Shop::getContext() == \Shop::CONTEXT_GROUP) {
+            return \Shop::getContextShopGroupID();
+        }
+
+        return null;
+    }
+
     /**
      * @return bool
      */
diff --git a/classes/Presenter/PsAccountsPresenter.php b/classes/Presenter/PsAccountsPresenter.php
index 0d5b7e924..eb1d823d9 100644
--- a/classes/Presenter/PsAccountsPresenter.php
+++ b/classes/Presenter/PsAccountsPresenter.php
@@ -109,6 +109,10 @@ public function present($psxName = 'ps_accounts')
         try {
             return array_merge(
                 [
+                    'currentContext' => [
+                        'type' => $shopContext->getShopContext(),
+                        'id' => $shopContext->getShopContextId(),
+                    ],
                     'psxName' => $psxName,
                     'psIs17' => $shopContext->isShop17(),
 
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index ac9590732..c38ae7b4b 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -120,7 +120,13 @@ public function getShopsTree($psxName)
         foreach (\Shop::getTree() as $groupId => $groupData) {
             $shops = [];
             foreach ($groupData['shops'] as $shopId => $shopData) {
-                $shops[] = $this->formatShopData($shopData, $psxName);
+                $data = $this->formatShopData($shopData, $psxName);
+
+                $shops[] = array_merge($data, [
+                    'multishop' => $this->shopContext->isMultishopActive(),
+                    'moduleName' => $psxName,
+                    'psVersion' => _PS_VERSION_,
+                ]);
             }
 
             $shopList[] = [

From e61a1302fbb4208d7555ba6c38111e255327753a Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Wed, 18 Aug 2021 10:05:40 +0200
Subject: [PATCH 03/30] fix php-cs-fixer and phpstan errors

---
 classes/Context/ShopContext.php | 6 +++---
 ps_accounts.php                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Context/ShopContext.php b/classes/Context/ShopContext.php
index 6a17e3265..19bcaeab4 100644
--- a/classes/Context/ShopContext.php
+++ b/classes/Context/ShopContext.php
@@ -69,7 +69,7 @@ public function isShop173()
     }
 
     /**
-     * @return bool
+     * @return int
      */
     public function getShopContext()
     {
@@ -79,12 +79,12 @@ public function getShopContext()
     /**
      * ID of shop or group
      *
-     * @return string | null
+     * @return int|null
      */
     public function getShopContextId()
     {
         if (\Shop::getContext() == \Shop::CONTEXT_SHOP) {
-            return \Shop::getContextShopID();;
+            return \Shop::getContextShopID();
         }
 
         if (\Shop::getContext() == \Shop::CONTEXT_GROUP) {
diff --git a/ps_accounts.php b/ps_accounts.php
index c696b9fcc..b4dbcbf08 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -273,9 +273,9 @@ public function hookActionObjectShopAddAfter($params)
             $this->switchConfigMultishopMode();
         }
 
-        $shopCreated = $params["object"];
+        $shopCreated = $params['object'];
 
-        /** @var \PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository $config */
+        /** @var \PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository $configuration */
         $configuration = $this->getService(\PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository::class);
         $actualShopId = $configuration->getShopId();
         $configuration->setShopId($shopCreated->id);

From a5ce57439d4639d6d05c99999137173ce1815dc3 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Wed, 18 Aug 2021 11:03:53 +0200
Subject: [PATCH 04/30] fix phpstan undefined property setShopId

---
 ps_accounts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ps_accounts.php b/ps_accounts.php
index b4dbcbf08..1f8f04004 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -283,7 +283,7 @@ public function hookActionObjectShopAddAfter($params)
         /** @var \PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider $rsaKeyProvider */
         $rsaKeyProvider = $this->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
         $rsaKeyProvider->generateKeys();
-        $configuration->setShopId = $actualShopId;
+        $configuration->setShopId($actualShopId);
 
         return true;
     }

From bf5a206303c51d57ac266f3af97d1b782cd3ca4b Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Wed, 25 Aug 2021 16:38:53 +0200
Subject: [PATCH 05/30] add user uuid and email on each shop in shop tree +
 adapt onboardingLink

---
 _dev/vue.config.js                        |  2 +-
 classes/Presenter/PsAccountsPresenter.php |  8 ++---
 classes/Provider/ShopProvider.php         | 41 +++++++++++++++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/_dev/vue.config.js b/_dev/vue.config.js
index 0e8d964e3..67df241dd 100644
--- a/_dev/vue.config.js
+++ b/_dev/vue.config.js
@@ -29,7 +29,7 @@ module.exports = {
     extract: false,
   },
   runtimeCompiler: true,
-  productionSourceMap: false,
+  // productionSourceMap: false,
   filenameHashing: false,
   outputDir: "../views/",
   assetsDir: "",
diff --git a/classes/Presenter/PsAccountsPresenter.php b/classes/Presenter/PsAccountsPresenter.php
index 6c23d2943..5c2758d91 100644
--- a/classes/Presenter/PsAccountsPresenter.php
+++ b/classes/Presenter/PsAccountsPresenter.php
@@ -106,10 +106,10 @@ public function present($psxName = 'ps_accounts')
 
         $moduleName = $this->module->name;
 
-        $currentShop = $this->shopProvider->getCurrentShop($psxName);
-        $shopBase64 = base64_encode((string) json_encode($currentShop));
+        $unlinkedShops = $this->shopProvider->getUnlinkedShops($psxName);
+        $shopBase64 = base64_encode((string) json_encode(array_values($unlinkedShops)));
         $onboardingLink = $this->module->getParameter('ps_accounts.accounts_ui_url')
-            . '?shopPayload=' . $shopBase64;
+            . '?shops=' . $shopBase64;
 
         try {
             return array_merge(
@@ -148,7 +148,7 @@ public function present($psxName = 'ps_accounts')
                         'employeeId' => $shopContext->getContext()->employee->id,
                         'isSuperAdmin' => $shopContext->getContext()->employee->isSuperAdmin(),
                     ],
-                    'currentShop' => $currentShop,
+                    'currentShop' => $this->shopProvider->getCurrentShop($psxName),
                     'isShopContext' => $shopContext->isShopContext(),
                     'superAdminEmail' => $this->psAccountsService->getSuperAdminEmail(),
 
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 67be0915c..10bea5035 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -83,6 +83,10 @@ public function formatShopData($shopData, $psxName = '')
             'uuid' => $configuration->getShopUuid() ?: null,
             'publicKey' => $configuration->getAccountsRsaPublicKey() ?: null,
             'employeeId' => (int) $configuration->getEmployeeId() ?: null,
+            'user' => [
+                'email' => $configuration->getFirebaseEmail() ?: null,
+                'uuid' => $configuration->getUserFirebaseUuid() ?: null,
+            ],
 
             'url' => $this->link->getAdminLink(
                 'AdminModules',
@@ -157,6 +161,43 @@ public function getShopsTree($psxName)
         return $shopList;
     }
 
+    /**
+     * @param string $psxName
+     *
+     * @return array
+     *
+     * @throws \PrestaShopException
+     */
+    public function getUnlinkedShops($psxName)
+    {
+        $shopTree = $this->getShopsTree($psxName);
+        $shops = [];
+
+        switch ($this->getShopContext()->getShopContext()) {
+            case \Shop::CONTEXT_ALL:
+                $shops = array_reduce($shopTree, function ($carry, $shopGroup) {
+                    return array_merge($carry, $shopGroup['shops']);
+                }, []);
+                break;
+            case \Shop::CONTEXT_GROUP:
+                $shops = array_reduce($shopTree, function ($carry, $shopGroup) {
+                    if ($shopGroup['id'] != $this->getShopContext()->getShopContextId()) {
+                        return $carry;
+                    }
+
+                    return array_merge($carry, $shopGroup['shops']);
+                }, []);
+                break;
+            case \Shop::CONTEXT_SHOP:
+                $shops = [$this->getCurrentShop($psxName)];
+                break;
+        }
+
+        return array_filter($shops, function ($shop) {
+            return $shop['uuid'] === null;
+        });
+    }
+
     /**
      * @return ShopContext
      */

From e81ca232fe67075422e1e146643f619c6e4f3fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.amorim@prestashop.com>
Date: Wed, 15 Sep 2021 16:33:18 +0200
Subject: [PATCH 06/30] fix: generate shop public keys when the shops are
 unlinked and the user is on a all shops context

set module version to 5.1.0 and register hooks on 5.1.0 upgrade
---
 classes/Service/ShopLinkAccountService.php |  3 +++
 config.xml                                 |  2 +-
 ps_accounts.php                            |  4 ++--
 upgrade/upgrade-5.1.0.php                  | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 upgrade/upgrade-5.1.0.php

diff --git a/classes/Service/ShopLinkAccountService.php b/classes/Service/ShopLinkAccountService.php
index b62b4243d..0bcabf969 100644
--- a/classes/Service/ShopLinkAccountService.php
+++ b/classes/Service/ShopLinkAccountService.php
@@ -120,6 +120,9 @@ public function resetLinkAccount()
         $this->shopTokenRepository->cleanupCredentials();
         $this->userTokenRepository->cleanupCredentials();
         $this->configuration->updateEmployeeId('');
+        try {
+            $this->rsaKeysProvider->generateKeys();
+        } catch (\Exception $e) {}
     }
 
     /**
diff --git a/config.xml b/config.xml
index 7a388f30b..9a93bae31 100644
--- a/config.xml
+++ b/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>ps_accounts</name>
 	<displayName><![CDATA[PrestaShop Account]]></displayName>
-	<version><![CDATA[5.0.0]]></version>
+	<version><![CDATA[5.1.0]]></version>
 	<description><![CDATA[Link your PrestaShop account to your online shop to activate &amp; manage services on your back-office. Don&#039;t uninstall this module if you are already using a service, as it will prevent it from working.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[administration]]></tab>
diff --git a/ps_accounts.php b/ps_accounts.php
index 1f8f04004..fb35eee38 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -28,7 +28,7 @@ class Ps_accounts extends Module
 
     // Needed in order to retrieve the module version easier (in api call headers) than instanciate
     // the module each time to get the version
-    const VERSION = '5.0.0';
+    const VERSION = '5.1.0';
 
     /**
      * @var array
@@ -86,7 +86,7 @@ public function __construct()
 
         // We cannot use the const VERSION because the const is not computed by addons marketplace
         // when the zip is uploaded
-        $this->version = '5.0.0';
+        $this->version = '5.1.0';
 
         $this->module_key = 'abf2cd758b4d629b2944d3922ef9db73';
 
diff --git a/upgrade/upgrade-5.1.0.php b/upgrade/upgrade-5.1.0.php
new file mode 100644
index 000000000..32e07fbec
--- /dev/null
+++ b/upgrade/upgrade-5.1.0.php
@@ -0,0 +1,16 @@
+<?php
+
+
+/**
+ * @param Ps_accounts $module
+ *
+ * @return bool
+ *
+ * @throws Exception
+ */
+function upgrade_module_5_1_0($module)
+{
+    $module->registerHook($module->getHookToInstall());
+
+    return true;
+}

From e879787b28d0b1116b95b5d1f92fc51fa912fc3b Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Thu, 23 Sep 2021 09:49:49 +0200
Subject: [PATCH 07/30] fix: phpcs

---
 classes/Service/ShopLinkAccountService.php | 3 ++-
 upgrade/upgrade-5.1.0.php                  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Service/ShopLinkAccountService.php b/classes/Service/ShopLinkAccountService.php
index 0bcabf969..8caa509c5 100644
--- a/classes/Service/ShopLinkAccountService.php
+++ b/classes/Service/ShopLinkAccountService.php
@@ -122,7 +122,8 @@ public function resetLinkAccount()
         $this->configuration->updateEmployeeId('');
         try {
             $this->rsaKeysProvider->generateKeys();
-        } catch (\Exception $e) {}
+        } catch (\Exception $e) {
+        }
     }
 
     /**
diff --git a/upgrade/upgrade-5.1.0.php b/upgrade/upgrade-5.1.0.php
index 32e07fbec..243685c15 100644
--- a/upgrade/upgrade-5.1.0.php
+++ b/upgrade/upgrade-5.1.0.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * @param Ps_accounts $module
  *

From 54ba333f13e08b0d406fba05ff023f8c5cf5a1eb Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Thu, 23 Sep 2021 16:37:11 +0200
Subject: [PATCH 08/30] feat: add emailIsValidated property on user object in
 shops tree

---
 classes/Context/ShopContext.php   | 17 +++++++++++++++++
 classes/Provider/ShopProvider.php |  3 +++
 config/common.yml                 |  1 +
 3 files changed, 21 insertions(+)

diff --git a/classes/Context/ShopContext.php b/classes/Context/ShopContext.php
index 19bcaeab4..c9f0ea954 100644
--- a/classes/Context/ShopContext.php
+++ b/classes/Context/ShopContext.php
@@ -22,6 +22,7 @@
 
 use Context;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\Repository\UserTokenRepository;
 
 /**
  * Get the shop context
@@ -33,6 +34,11 @@ class ShopContext
      */
     private $configuration;
 
+    /**
+     * @var UserTokenRepository
+     */
+    private $userTokenRepository;
+
     /**
      * @var Context
      */
@@ -42,13 +48,16 @@ class ShopContext
      * ShopContext constructor.
      *
      * @param ConfigurationRepository $configuration
+     * @param UserTokenRepository $userTokenRepository
      * @param Context $context
      */
     public function __construct(
         ConfigurationRepository $configuration,
+        UserTokenRepository $userTokenRepository,
         Context $context
     ) {
         $this->configuration = $configuration;
+        $this->userTokenRepository = $userTokenRepository;
         $this->context = $context;
     }
 
@@ -149,4 +158,12 @@ public function getConfiguration()
     {
         return $this->configuration;
     }
+
+    /**
+     * @return UserTokenRepository
+     */
+    public function getUser()
+    {
+        return $this->userTokenRepository;
+    }
 }
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 10bea5035..eb39fd002 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -22,6 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
+use PrestaShop\Module\PsAccounts\Repository\UserTokenRepository;
 use PrestaShop\Module\PsAccounts\Service\ShopLinkAccountService;
 
 class ShopProvider
@@ -61,6 +62,7 @@ public function __construct(
     public function formatShopData($shopData, $psxName = '')
     {
         $configuration = $this->shopContext->getConfiguration();
+        $user = $this->shopContext->getUser();
 
         $shopId = $configuration->getShopId();
 
@@ -86,6 +88,7 @@ public function formatShopData($shopData, $psxName = '')
             'user' => [
                 'email' => $configuration->getFirebaseEmail() ?: null,
                 'uuid' => $configuration->getUserFirebaseUuid() ?: null,
+                'emailIsValidated' => $user->getTokenEmailVerified(),
             ],
 
             'url' => $this->link->getAdminLink(
diff --git a/config/common.yml b/config/common.yml
index 7bf390280..d805304e1 100644
--- a/config/common.yml
+++ b/config/common.yml
@@ -16,6 +16,7 @@ services:
     public: true
     arguments:
       - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+      - '@PrestaShop\Module\PsAccounts\Repository\UserTokenRepository'
       - '@ps_accounts.context'
 
   PrestaShop\Module\PsAccounts\Adapter\Configuration:

From a60aadc685d9753610aae70dd9f4a67f5636aef2 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Tue, 28 Sep 2021 15:43:26 +0200
Subject: [PATCH 09/30] fix: php_cs

---
 classes/Provider/ShopProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index eb39fd002..929bd8391 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -22,7 +22,6 @@
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\Repository\UserTokenRepository;
 use PrestaShop\Module\PsAccounts\Service\ShopLinkAccountService;
 
 class ShopProvider

From 1d48da339ba0597a8125b9f778dc6adc34220ae1 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Mon, 4 Oct 2021 11:14:53 +0200
Subject: [PATCH 10/30] fix: padding

---
 _dev/src/core/settings/pages/SettingsApp.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_dev/src/core/settings/pages/SettingsApp.vue b/_dev/src/core/settings/pages/SettingsApp.vue
index 81df78dc6..065b6327d 100644
--- a/_dev/src/core/settings/pages/SettingsApp.vue
+++ b/_dev/src/core/settings/pages/SettingsApp.vue
@@ -61,6 +61,7 @@ export default {
   text-align: left;
 
   .tab-content {
+    padding: 0;
     background: transparent;
   }
 }

From 3f906795f3dc0a96f0cd38bcae7fbc37d973b662 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Wed, 6 Oct 2021 09:07:30 +0200
Subject: [PATCH 11/30] fix: unlinkedShops with v4 linked shops

---
 _dev/src/core/settings/pages/SettingsApp.vue | 8 +++++++-
 classes/Provider/ShopProvider.php            | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/_dev/src/core/settings/pages/SettingsApp.vue b/_dev/src/core/settings/pages/SettingsApp.vue
index 065b6327d..98f3732af 100644
--- a/_dev/src/core/settings/pages/SettingsApp.vue
+++ b/_dev/src/core/settings/pages/SettingsApp.vue
@@ -20,7 +20,7 @@
   <div id="settingsApp">
     <Tabs :vertical="vertical">
       <Tab :label="$t('general.settings')" to="/settings/onboarding" />
-<!--      <Tab :label="$t('general.help')" to="/settings/help" />-->
+      <!--      <Tab :label="$t('general.help')" to="/settings/help" />-->
     </Tabs>
   </div>
 </template>
@@ -64,6 +64,12 @@ export default {
     padding: 0;
     background: transparent;
   }
+
+  @media only screen and (max-width: 768px) {
+    .tab-content {
+      padding: 1rem;
+    }
+  }
 }
 
 #settingsApp .card-header,
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 929bd8391..e825125c0 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -196,7 +196,7 @@ public function getUnlinkedShops($psxName)
         }
 
         return array_filter($shops, function ($shop) {
-            return $shop['uuid'] === null;
+            return $shop['uuid'] === null || ($shop['uuid'] && $shop['isLinkedV4']);
         });
     }
 

From 1d963473e4e583ec958b155f62c02d9a71888b77 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Wed, 6 Oct 2021 14:48:52 +0200
Subject: [PATCH 12/30] fix: responsive

---
 _dev/src/core/settings/pages/OnBoardingApp.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/_dev/src/core/settings/pages/OnBoardingApp.vue b/_dev/src/core/settings/pages/OnBoardingApp.vue
index 9d12b8d21..013281aaf 100644
--- a/_dev/src/core/settings/pages/OnBoardingApp.vue
+++ b/_dev/src/core/settings/pages/OnBoardingApp.vue
@@ -17,7 +17,7 @@
  * International Registered Trademark & Property of PrestaShop SA
  *-->
 <template>
-  <div class="onboarding pt-5">
+  <div class="pt-5 onboarding">
     <section class="onboarding-header">
       <ConfigInformation :app="app" />
     </section>
@@ -99,10 +99,16 @@ export default {
 
 <style lang="scss" scoped>
 .onboarding {
-  @apply max-w-6xl mx-auto #{!important};
+  @apply max-w-screen-lg mx-auto #{!important};
 
   &-header {
-    @apply mb-4 #{!important};
+    @apply mb-2 #{!important};
+  }
+
+  @screen md {
+    &-header {
+      @apply mb-4 #{!important};
+    }
   }
 }
 </style>

From e877e92e8ac7c6dff21564477330572598997319 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Mon, 11 Oct 2021 13:08:49 +0200
Subject: [PATCH 13/30] fix: add current employeeId to unlinked shops data

---
 classes/Presenter/PsAccountsPresenter.php |  9 +++++++--
 classes/Provider/ShopProvider.php         | 11 +++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/classes/Presenter/PsAccountsPresenter.php b/classes/Presenter/PsAccountsPresenter.php
index e10039fae..e87adc5d3 100644
--- a/classes/Presenter/PsAccountsPresenter.php
+++ b/classes/Presenter/PsAccountsPresenter.php
@@ -104,8 +104,13 @@ public function present($psxName = 'ps_accounts')
 
         $moduleName = $this->module->name;
 
-        $unlinkedShops = $this->shopProvider->getUnlinkedShops($psxName);
-        $shopBase64 = base64_encode((string) json_encode(array_values($unlinkedShops)));
+        $unlinkedShops = $this->shopProvider->getUnlinkedShops(
+            $psxName,
+            $shopContext->getContext()->employee->id
+        );
+        $shopBase64 = base64_encode(
+            (string) json_encode(array_values($unlinkedShops))
+        );
         $onboardingLink = $this->module->getParameter('ps_accounts.accounts_ui_url')
             . '?shops=' . $shopBase64;
 
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index e825125c0..1ea351252 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -165,12 +165,13 @@ public function getShopsTree($psxName)
 
     /**
      * @param string $psxName
+     * @param int $employeeId
      *
      * @return array
      *
      * @throws \PrestaShopException
      */
-    public function getUnlinkedShops($psxName)
+    public function getUnlinkedShops($psxName, $employeeId)
     {
         $shopTree = $this->getShopsTree($psxName);
         $shops = [];
@@ -195,9 +196,15 @@ public function getUnlinkedShops($psxName)
                 break;
         }
 
-        return array_filter($shops, function ($shop) {
+        $unlinkedShops = array_filter($shops, function ($shop) {
             return $shop['uuid'] === null || ($shop['uuid'] && $shop['isLinkedV4']);
         });
+
+        return array_map(function ($shop) use ($employeeId) {
+            $shop['employeeId'] = (string) $employeeId;
+
+            return $shop;
+        }, $unlinkedShops);
     }
 
     /**

From 36f16430dd9f93fcffe18c5c8fc2a2bd24e0cdac Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Mon, 11 Oct 2021 18:39:06 +0200
Subject: [PATCH 14/30] feat: auto generate public key if not present

---
 classes/Provider/ShopProvider.php             |  2 +-
 .../Repository/ConfigurationRepository.php    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 1ea351252..e165684ab 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -82,7 +82,7 @@ public function formatShopData($shopData, $psxName = '')
 
             // LinkAccount
             'uuid' => $configuration->getShopUuid() ?: null,
-            'publicKey' => $configuration->getAccountsRsaPublicKey() ?: null,
+            'publicKey' => $configuration->getOrGenerateAccountsRsaPublicKey() ?: null,
             'employeeId' => (int) $configuration->getEmployeeId() ?: null,
             'user' => [
                 'email' => $configuration->getFirebaseEmail() ?: null,
diff --git a/classes/Repository/ConfigurationRepository.php b/classes/Repository/ConfigurationRepository.php
index 337eacb05..f6258738c 100644
--- a/classes/Repository/ConfigurationRepository.php
+++ b/classes/Repository/ConfigurationRepository.php
@@ -21,6 +21,7 @@
 namespace PrestaShop\Module\PsAccounts\Repository;
 
 use PrestaShop\Module\PsAccounts\Adapter\Configuration;
+use PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider;
 
 class ConfigurationRepository
 {
@@ -193,6 +194,30 @@ public function getAccountsRsaPrivateKey()
         return $this->configuration->get(Configuration::PS_ACCOUNTS_RSA_PRIVATE_KEY);
     }
 
+    /**
+     * @return string|null
+     */
+    public function getOrGenerateAccountsRsaPublicKey()
+    {
+        $publicKey = $this->configuration->get(Configuration::PS_ACCOUNTS_RSA_PUBLIC_KEY);
+        if ($publicKey) {
+            return $publicKey;
+        }
+
+        try {
+            /** @var \Ps_accounts $module */
+            $module = \Module::getInstanceByName('ps_accounts');
+
+            /** @var RsaKeysProvider $rsaKeyProvider */
+            $rsaKeyProvider = $module->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
+
+            $rsaKeyProvider->generateKeys(true);
+            return $this->configuration->get(Configuration::PS_ACCOUNTS_RSA_PUBLIC_KEY);
+        } catch (\Exception $e) {
+        }
+        return null;
+    }
+
     /**
      * @param string $key
      *

From d6511e43cfdf3cebe7e6adb325f8bee18027c1b7 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Mon, 11 Oct 2021 18:44:42 +0200
Subject: [PATCH 15/30] fix: phpcsfixer

---
 classes/Repository/ConfigurationRepository.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/Repository/ConfigurationRepository.php b/classes/Repository/ConfigurationRepository.php
index f6258738c..51d6e22a7 100644
--- a/classes/Repository/ConfigurationRepository.php
+++ b/classes/Repository/ConfigurationRepository.php
@@ -212,9 +212,11 @@ public function getOrGenerateAccountsRsaPublicKey()
             $rsaKeyProvider = $module->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
 
             $rsaKeyProvider->generateKeys(true);
+
             return $this->configuration->get(Configuration::PS_ACCOUNTS_RSA_PUBLIC_KEY);
         } catch (\Exception $e) {
         }
+
         return null;
     }
 

From 192e3ff545ab281bace5555830ab6d7313fca32c Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Tue, 12 Oct 2021 11:01:24 +0200
Subject: [PATCH 16/30] fix: rename getUser into getUserToken

---
 classes/Context/ShopContext.php   | 2 +-
 classes/Provider/ShopProvider.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/Context/ShopContext.php b/classes/Context/ShopContext.php
index c9f0ea954..b7cd15833 100644
--- a/classes/Context/ShopContext.php
+++ b/classes/Context/ShopContext.php
@@ -162,7 +162,7 @@ public function getConfiguration()
     /**
      * @return UserTokenRepository
      */
-    public function getUser()
+    public function getUserToken()
     {
         return $this->userTokenRepository;
     }
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 1ea351252..0c00820a8 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -61,7 +61,7 @@ public function __construct(
     public function formatShopData($shopData, $psxName = '')
     {
         $configuration = $this->shopContext->getConfiguration();
-        $user = $this->shopContext->getUser();
+        $userToken = $this->shopContext->getUserToken();
 
         $shopId = $configuration->getShopId();
 
@@ -87,7 +87,7 @@ public function formatShopData($shopData, $psxName = '')
             'user' => [
                 'email' => $configuration->getFirebaseEmail() ?: null,
                 'uuid' => $configuration->getUserFirebaseUuid() ?: null,
-                'emailIsValidated' => $user->getTokenEmailVerified(),
+                'emailIsValidated' => $userToken->getTokenEmailVerified(),
             ],
 
             'url' => $this->link->getAdminLink(

From b067f2ee0d6a603911653ef664aae482cf6d7b3f Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Tue, 12 Oct 2021 11:09:59 +0200
Subject: [PATCH 17/30] fix: use UserTokenRepository for getting user email and
 uuid

---
 classes/Provider/ShopProvider.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 0c00820a8..846386411 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -85,8 +85,8 @@ public function formatShopData($shopData, $psxName = '')
             'publicKey' => $configuration->getAccountsRsaPublicKey() ?: null,
             'employeeId' => (int) $configuration->getEmployeeId() ?: null,
             'user' => [
-                'email' => $configuration->getFirebaseEmail() ?: null,
-                'uuid' => $configuration->getUserFirebaseUuid() ?: null,
+                'email' => $userToken->getTokenEmail() ?: null,
+                'uuid' => $userToken->getTokenUuid() ?: null,
                 'emailIsValidated' => $userToken->getTokenEmailVerified(),
             ],
 

From 2f89292a9b66e2659f614c8d694f73a6968a822a Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Tue, 12 Oct 2021 11:11:38 +0200
Subject: [PATCH 18/30] fix: remove useless code for generate keys in hook
 ActionObjectShopAddAfter

---
 ps_accounts.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/ps_accounts.php b/ps_accounts.php
index 60f59003e..61af02447 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -264,18 +264,6 @@ public function hookActionObjectShopAddAfter($params)
             $this->switchConfigMultishopMode();
         }
 
-        $shopCreated = $params['object'];
-
-        /** @var \PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository $configuration */
-        $configuration = $this->getService(\PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository::class);
-        $actualShopId = $configuration->getShopId();
-        $configuration->setShopId($shopCreated->id);
-
-        /** @var \PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider $rsaKeyProvider */
-        $rsaKeyProvider = $this->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
-        $rsaKeyProvider->generateKeys();
-        $configuration->setShopId($actualShopId);
-
         return true;
     }
 

From 1046f0bf563b91de26af33a5e5fdc2e7d22ed435 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Tue, 12 Oct 2021 17:21:16 +0200
Subject: [PATCH 19/30] feat: move rsa regenerate to RsaKeysProvider

---
 classes/Presenter/PsAccountsPresenter.php     |  2 --
 classes/Provider/RsaKeysProvider.php          | 20 ++++++++++++++
 .../Repository/ConfigurationRepository.php    | 26 -------------------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/classes/Presenter/PsAccountsPresenter.php b/classes/Presenter/PsAccountsPresenter.php
index e87adc5d3..f46d8fb3b 100644
--- a/classes/Presenter/PsAccountsPresenter.php
+++ b/classes/Presenter/PsAccountsPresenter.php
@@ -98,8 +98,6 @@ public function __construct(
      */
     public function present($psxName = 'ps_accounts')
     {
-        $this->shopLinkAccountService->prepareLinkAccount();
-
         $shopContext = $this->shopProvider->getShopContext();
 
         $moduleName = $this->module->name;
diff --git a/classes/Provider/RsaKeysProvider.php b/classes/Provider/RsaKeysProvider.php
index ba8ad4879..9059f5fd6 100644
--- a/classes/Provider/RsaKeysProvider.php
+++ b/classes/Provider/RsaKeysProvider.php
@@ -139,6 +139,26 @@ public function generateKeys($refresh = false)
         }
     }
 
+    /**
+     * @return string|null
+     */
+    public function getOrGenerateAccountsRsaPublicKey()
+    {
+        $publicKey = $this->getPublicKey();
+        if ($publicKey) {
+            return $publicKey;
+        }
+
+        try {
+            $this->regenerateKeys();
+
+            return $this->getPublicKey();
+        } catch (\Exception $e) {
+        }
+
+        return null;
+    }
+
     /**
      * @return void
      *
diff --git a/classes/Repository/ConfigurationRepository.php b/classes/Repository/ConfigurationRepository.php
index 51d6e22a7..079d2a248 100644
--- a/classes/Repository/ConfigurationRepository.php
+++ b/classes/Repository/ConfigurationRepository.php
@@ -194,32 +194,6 @@ public function getAccountsRsaPrivateKey()
         return $this->configuration->get(Configuration::PS_ACCOUNTS_RSA_PRIVATE_KEY);
     }
 
-    /**
-     * @return string|null
-     */
-    public function getOrGenerateAccountsRsaPublicKey()
-    {
-        $publicKey = $this->configuration->get(Configuration::PS_ACCOUNTS_RSA_PUBLIC_KEY);
-        if ($publicKey) {
-            return $publicKey;
-        }
-
-        try {
-            /** @var \Ps_accounts $module */
-            $module = \Module::getInstanceByName('ps_accounts');
-
-            /** @var RsaKeysProvider $rsaKeyProvider */
-            $rsaKeyProvider = $module->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
-
-            $rsaKeyProvider->generateKeys(true);
-
-            return $this->configuration->get(Configuration::PS_ACCOUNTS_RSA_PUBLIC_KEY);
-        } catch (\Exception $e) {
-        }
-
-        return null;
-    }
-
     /**
      * @param string $key
      *

From 99fb304aafcfcd97ac2ad4b2534c4f1857e45eb4 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Tue, 12 Oct 2021 17:25:33 +0200
Subject: [PATCH 20/30] feat: use rsaKeyProvider to generate keys

---
 classes/Provider/ShopProvider.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index e165684ab..64f4983d5 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -73,6 +73,9 @@ public function formatShopData($shopData, $psxName = '')
         /** @var ShopLinkAccountService $shopLinkAccountService */
         $shopLinkAccountService = $module->getService(ShopLinkAccountService::class);
 
+        /** @var RsaKeysProvider $rsaKeyProvider */
+        $rsaKeyProvider = $module->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
+
         $data = [
             'id' => (string) $shopData['id_shop'],
             'name' => $shopData['name'],
@@ -82,7 +85,7 @@ public function formatShopData($shopData, $psxName = '')
 
             // LinkAccount
             'uuid' => $configuration->getShopUuid() ?: null,
-            'publicKey' => $configuration->getOrGenerateAccountsRsaPublicKey() ?: null,
+            'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
             'employeeId' => (int) $configuration->getEmployeeId() ?: null,
             'user' => [
                 'email' => $configuration->getFirebaseEmail() ?: null,

From 1990ad47a72905d65b2dd32a46cd073cfacb7048 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Tue, 12 Oct 2021 17:30:59 +0200
Subject: [PATCH 21/30] fix: csfixer

---
 classes/Provider/ShopProvider.php              | 2 +-
 classes/Repository/ConfigurationRepository.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 64f4983d5..dd3d68faf 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -74,7 +74,7 @@ public function formatShopData($shopData, $psxName = '')
         $shopLinkAccountService = $module->getService(ShopLinkAccountService::class);
 
         /** @var RsaKeysProvider $rsaKeyProvider */
-        $rsaKeyProvider = $module->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
+        $rsaKeyProvider = $module->getService(RsaKeysProvider::class);
 
         $data = [
             'id' => (string) $shopData['id_shop'],
diff --git a/classes/Repository/ConfigurationRepository.php b/classes/Repository/ConfigurationRepository.php
index 079d2a248..337eacb05 100644
--- a/classes/Repository/ConfigurationRepository.php
+++ b/classes/Repository/ConfigurationRepository.php
@@ -21,7 +21,6 @@
 namespace PrestaShop\Module\PsAccounts\Repository;
 
 use PrestaShop\Module\PsAccounts\Adapter\Configuration;
-use PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider;
 
 class ConfigurationRepository
 {

From 01c1fc80c35fd63ec46fccd8e8bb6b191930f3cc Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Tue, 12 Oct 2021 17:37:45 +0200
Subject: [PATCH 22/30] fix: phpstan return of function

---
 classes/Provider/RsaKeysProvider.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/classes/Provider/RsaKeysProvider.php b/classes/Provider/RsaKeysProvider.php
index 9059f5fd6..93b1727d1 100644
--- a/classes/Provider/RsaKeysProvider.php
+++ b/classes/Provider/RsaKeysProvider.php
@@ -140,7 +140,7 @@ public function generateKeys($refresh = false)
     }
 
     /**
-     * @return string|null
+     * @return string|null|bool
      */
     public function getOrGenerateAccountsRsaPublicKey()
     {
@@ -154,9 +154,8 @@ public function getOrGenerateAccountsRsaPublicKey()
 
             return $this->getPublicKey();
         } catch (\Exception $e) {
+            return null;
         }
-
-        return null;
     }
 
     /**
@@ -174,11 +173,7 @@ public function regenerateKeys()
      */
     public function hasKeys()
     {
-        return false === (
-                empty($this->configuration->getAccountsRsaPublicKey())
-                || empty($this->configuration->getAccountsRsaPrivateKey())
-                || empty($this->configuration->getAccountsRsaSignData())
-            );
+        return false === empty($this->configuration->getAccountsRsaPublicKey());
     }
 
     /**

From 8ebcc53b934c706ff466aaa51c9e78e7e346c207 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Thu, 14 Oct 2021 10:15:41 +0200
Subject: [PATCH 23/30] fix: phpcsfixer

---
 classes/Provider/RsaKeysProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Provider/RsaKeysProvider.php b/classes/Provider/RsaKeysProvider.php
index 93b1727d1..c8aa56376 100644
--- a/classes/Provider/RsaKeysProvider.php
+++ b/classes/Provider/RsaKeysProvider.php
@@ -140,7 +140,7 @@ public function generateKeys($refresh = false)
     }
 
     /**
-     * @return string|null|bool
+     * @return string|bool|null
      */
     public function getOrGenerateAccountsRsaPublicKey()
     {

From bbbe1607e76da0a6ceca9f40d85bd58a0d9d89c6 Mon Sep 17 00:00:00 2001
From: Antoine Metifeu <ametifeu@gmail.com>
Date: Thu, 14 Oct 2021 11:22:04 +0200
Subject: [PATCH 24/30] chore: phpstan neon file 1.7 for prestashop latest

---
 .github/workflows/accounts-qc-php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/accounts-qc-php.yml b/.github/workflows/accounts-qc-php.yml
index 8e6d5bd3a..3d85f0aa6 100755
--- a/.github/workflows/accounts-qc-php.yml
+++ b/.github/workflows/accounts-qc-php.yml
@@ -54,7 +54,7 @@ jobs:
         id: neon
         run: |
           PS_VERSION="${{ matrix.presta-versions }}"
-          [[ "${PS_VERSION:0:3}" != '1.7' ]] && echo ::set-output name=filename::phpstan-PS-1.6.neon || echo ::set-output name=filename::phpstan-PS-1.7.neon
+          [[ "${PS_VERSION:0:3}" != '1.6' ]] && echo ::set-output name=filename::phpstan-PS-1.7.neon || echo ::set-output name=filename::phpstan-PS-1.6.neon
 
       - name: PHPStan PrestaShop ${{ matrix.presta-versions }}
         run: |

From 9793aab95cb646d1f99d7c7377c6f869bdd7f2c5 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Thu, 14 Oct 2021 13:41:40 +0200
Subject: [PATCH 25/30] fix: phpstan error + delete volume at then end of
 phpstan

---
 Makefile                           | 1 +
 classes/Module/Install.php         | 4 +++-
 classes/Provider/ShopProvider.php  | 5 +++--
 controllers/front/apiV1ShopUrl.php | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e56556e20..0716f1b56 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ endif
 	  --workdir=/web/module \
 	  phpstan/phpstan:${PHPSTAN_VERSION} analyse \
 	  --configuration=/web/module/tests/phpstan/${NEON_FILE}
+	docker volume rm ps-volume
 
 
 # target: phpunit                                - Start phpunit
diff --git a/classes/Module/Install.php b/classes/Module/Install.php
index 5b9710b8b..534fa834f 100644
--- a/classes/Module/Install.php
+++ b/classes/Module/Install.php
@@ -66,7 +66,9 @@ public function installInMenu()
             $tab->name = [];
 
             foreach (\Language::getLanguages(true) as $lang) {
-                $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
+                if (is_array($lang)) {
+                    $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
+                }
             }
 
             $tab->id_parent = -1 == self::PARENT_TAB_NAME ? (int) \Tab::getIdFromClassName((string) self::PARENT_TAB_NAME) : -1;
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index dd3d68faf..3361d6d66 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -121,7 +121,8 @@ public function formatShopData($shopData, $psxName = '')
      */
     public function getCurrentShop($psxName = '')
     {
-        $data = $this->formatShopData(\Shop::getShop($this->shopContext->getContext()->shop->id), $psxName);
+        $shop = \Shop::getShop($this->shopContext->getContext()->shop->id);
+        $data = is_array($shop) ? $this->formatShopData($shop, $psxName) : [];
 
         return array_merge($data, [
             'multishop' => $this->shopContext->isMultishopActive(),
@@ -221,7 +222,7 @@ public function getShopContext()
     /**
      * @param int $shopId
      *
-     * @return false|string|null
+     * @return false|string
      */
     private function getShopPhysicalUri($shopId)
     {
diff --git a/controllers/front/apiV1ShopUrl.php b/controllers/front/apiV1ShopUrl.php
index 72e6a6b28..f1c2db715 100644
--- a/controllers/front/apiV1ShopUrl.php
+++ b/controllers/front/apiV1ShopUrl.php
@@ -57,7 +57,8 @@ public function __construct()
      */
     public function show($shop, array $payload)
     {
-        $shopData = $this->shopProvider->formatShopData(\Shop::getShop($shop->id));
+        $shop = \Shop::getShop($shop->id);
+        $shopData = is_array($shop) ? $this->shopProvider->formatShopData($shop) : [];
 
         return [
             'domain' => $shopData['domain'],

From e0372213b4e946dcfd9ea5b0eee41c2d3e518467 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Thu, 14 Oct 2021 15:49:58 +0200
Subject: [PATCH 26/30] fix: make all phpstan happy (1.6, 1.7)

---
 classes/Provider/ShopProvider.php  | 7 ++++---
 controllers/front/apiV1ShopUrl.php | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 3361d6d66..7d4f03c62 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * @param array $shopData
+     * @param array|bool $shopData
      * @param string $psxName
      *
      * @return array
@@ -60,6 +60,8 @@ public function __construct(
      */
     public function formatShopData($shopData, $psxName = '')
     {
+        if (is_bool($shopData))
+            return [];
         $configuration = $this->shopContext->getConfiguration();
         $user = $this->shopContext->getUser();
 
@@ -121,8 +123,7 @@ public function formatShopData($shopData, $psxName = '')
      */
     public function getCurrentShop($psxName = '')
     {
-        $shop = \Shop::getShop($this->shopContext->getContext()->shop->id);
-        $data = is_array($shop) ? $this->formatShopData($shop, $psxName) : [];
+        $data = $this->formatShopData(\Shop::getShop($this->shopContext->getContext()->shop->id), $psxName);
 
         return array_merge($data, [
             'multishop' => $this->shopContext->isMultishopActive(),
diff --git a/controllers/front/apiV1ShopUrl.php b/controllers/front/apiV1ShopUrl.php
index f1c2db715..72e6a6b28 100644
--- a/controllers/front/apiV1ShopUrl.php
+++ b/controllers/front/apiV1ShopUrl.php
@@ -57,8 +57,7 @@ public function __construct()
      */
     public function show($shop, array $payload)
     {
-        $shop = \Shop::getShop($shop->id);
-        $shopData = is_array($shop) ? $this->shopProvider->formatShopData($shop) : [];
+        $shopData = $this->shopProvider->formatShopData(\Shop::getShop($shop->id));
 
         return [
             'domain' => $shopData['domain'],

From b1b0bdd19974a0751267ea3d9d43bccc5c9e6747 Mon Sep 17 00:00:00 2001
From: atourneriePresta <76098514+atourneriePresta@users.noreply.github.com>
Date: Fri, 15 Oct 2021 09:19:39 +0200
Subject: [PATCH 27/30] feat: auto generate public key if not present (#223)

* feat: auto generate public key if not present

* fix: phpcsfixer

* feat: move rsa regenerate to RsaKeysProvider

* feat: use rsaKeyProvider to generate keys

* fix: csfixer

* fix: phpstan return of function

* fix: phpcsfixer

* fix: phpstan error + delete volume at then end of phpstan

* fix: make all phpstan happy (1.6, 1.7)

* fix: php-cs-fixer

Co-authored-by: Antoine Metifeu <ametifeu@gmail.com>
---
 Makefile                                  |  1 +
 classes/Module/Install.php                |  4 +++-
 classes/Presenter/PsAccountsPresenter.php |  2 --
 classes/Provider/RsaKeysProvider.php      | 25 ++++++++++++++++++-----
 classes/Provider/ShopProvider.php         | 13 +++++++++---
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index e56556e20..0716f1b56 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ endif
 	  --workdir=/web/module \
 	  phpstan/phpstan:${PHPSTAN_VERSION} analyse \
 	  --configuration=/web/module/tests/phpstan/${NEON_FILE}
+	docker volume rm ps-volume
 
 
 # target: phpunit                                - Start phpunit
diff --git a/classes/Module/Install.php b/classes/Module/Install.php
index 5b9710b8b..534fa834f 100644
--- a/classes/Module/Install.php
+++ b/classes/Module/Install.php
@@ -66,7 +66,9 @@ public function installInMenu()
             $tab->name = [];
 
             foreach (\Language::getLanguages(true) as $lang) {
-                $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
+                if (is_array($lang)) {
+                    $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
+                }
             }
 
             $tab->id_parent = -1 == self::PARENT_TAB_NAME ? (int) \Tab::getIdFromClassName((string) self::PARENT_TAB_NAME) : -1;
diff --git a/classes/Presenter/PsAccountsPresenter.php b/classes/Presenter/PsAccountsPresenter.php
index e87adc5d3..f46d8fb3b 100644
--- a/classes/Presenter/PsAccountsPresenter.php
+++ b/classes/Presenter/PsAccountsPresenter.php
@@ -98,8 +98,6 @@ public function __construct(
      */
     public function present($psxName = 'ps_accounts')
     {
-        $this->shopLinkAccountService->prepareLinkAccount();
-
         $shopContext = $this->shopProvider->getShopContext();
 
         $moduleName = $this->module->name;
diff --git a/classes/Provider/RsaKeysProvider.php b/classes/Provider/RsaKeysProvider.php
index ba8ad4879..c8aa56376 100644
--- a/classes/Provider/RsaKeysProvider.php
+++ b/classes/Provider/RsaKeysProvider.php
@@ -139,6 +139,25 @@ public function generateKeys($refresh = false)
         }
     }
 
+    /**
+     * @return string|bool|null
+     */
+    public function getOrGenerateAccountsRsaPublicKey()
+    {
+        $publicKey = $this->getPublicKey();
+        if ($publicKey) {
+            return $publicKey;
+        }
+
+        try {
+            $this->regenerateKeys();
+
+            return $this->getPublicKey();
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
+
     /**
      * @return void
      *
@@ -154,11 +173,7 @@ public function regenerateKeys()
      */
     public function hasKeys()
     {
-        return false === (
-                empty($this->configuration->getAccountsRsaPublicKey())
-                || empty($this->configuration->getAccountsRsaPrivateKey())
-                || empty($this->configuration->getAccountsRsaSignData())
-            );
+        return false === empty($this->configuration->getAccountsRsaPublicKey());
     }
 
     /**
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 846386411..133c6a81b 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * @param array $shopData
+     * @param array|bool $shopData
      * @param string $psxName
      *
      * @return array
@@ -60,6 +60,10 @@ public function __construct(
      */
     public function formatShopData($shopData, $psxName = '')
     {
+        if (is_bool($shopData)) {
+            return [];
+        }
+
         $configuration = $this->shopContext->getConfiguration();
         $userToken = $this->shopContext->getUserToken();
 
@@ -73,6 +77,9 @@ public function formatShopData($shopData, $psxName = '')
         /** @var ShopLinkAccountService $shopLinkAccountService */
         $shopLinkAccountService = $module->getService(ShopLinkAccountService::class);
 
+        /** @var RsaKeysProvider $rsaKeyProvider */
+        $rsaKeyProvider = $module->getService(RsaKeysProvider::class);
+
         $data = [
             'id' => (string) $shopData['id_shop'],
             'name' => $shopData['name'],
@@ -82,7 +89,7 @@ public function formatShopData($shopData, $psxName = '')
 
             // LinkAccount
             'uuid' => $configuration->getShopUuid() ?: null,
-            'publicKey' => $configuration->getAccountsRsaPublicKey() ?: null,
+            'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
             'employeeId' => (int) $configuration->getEmployeeId() ?: null,
             'user' => [
                 'email' => $userToken->getTokenEmail() ?: null,
@@ -218,7 +225,7 @@ public function getShopContext()
     /**
      * @param int $shopId
      *
-     * @return false|string|null
+     * @return false|string
      */
     private function getShopPhysicalUri($shopId)
     {

From 8e77b94a43165d94dd02cd5ee5c3bea2e0c06d43 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Fri, 15 Oct 2021 09:28:10 +0200
Subject: [PATCH 28/30] fix: phpstan with cast :)

---
 classes/Module/Install.php         | 5 ++---
 classes/Provider/ShopProvider.php  | 8 +++-----
 controllers/front/apiV1ShopUrl.php | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/classes/Module/Install.php b/classes/Module/Install.php
index 534fa834f..bc67a414f 100644
--- a/classes/Module/Install.php
+++ b/classes/Module/Install.php
@@ -65,10 +65,9 @@ public function installInMenu()
             $tab->class_name = $controllerName;
             $tab->name = [];
 
+            /** @var array $lang */
             foreach (\Language::getLanguages(true) as $lang) {
-                if (is_array($lang)) {
-                    $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
-                }
+                $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
             }
 
             $tab->id_parent = -1 == self::PARENT_TAB_NAME ? (int) \Tab::getIdFromClassName((string) self::PARENT_TAB_NAME) : -1;
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index 7d4f03c62..079432745 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * @param array|bool $shopData
+     * @param array $shopData
      * @param string $psxName
      *
      * @return array
@@ -60,8 +60,6 @@ public function __construct(
      */
     public function formatShopData($shopData, $psxName = '')
     {
-        if (is_bool($shopData))
-            return [];
         $configuration = $this->shopContext->getConfiguration();
         $user = $this->shopContext->getUser();
 
@@ -123,7 +121,7 @@ public function formatShopData($shopData, $psxName = '')
      */
     public function getCurrentShop($psxName = '')
     {
-        $data = $this->formatShopData(\Shop::getShop($this->shopContext->getContext()->shop->id), $psxName);
+        $data = $this->formatShopData((array) \Shop::getShop($this->shopContext->getContext()->shop->id), $psxName);
 
         return array_merge($data, [
             'multishop' => $this->shopContext->isMultishopActive(),
@@ -146,7 +144,7 @@ public function getShopsTree($psxName)
         foreach (\Shop::getTree() as $groupId => $groupData) {
             $shops = [];
             foreach ($groupData['shops'] as $shopId => $shopData) {
-                $data = $this->formatShopData($shopData, $psxName);
+                $data = $this->formatShopData((array) $shopData, $psxName);
 
                 $shops[] = array_merge($data, [
                     'multishop' => $this->shopContext->isMultishopActive(),
diff --git a/controllers/front/apiV1ShopUrl.php b/controllers/front/apiV1ShopUrl.php
index 72e6a6b28..719d54c22 100644
--- a/controllers/front/apiV1ShopUrl.php
+++ b/controllers/front/apiV1ShopUrl.php
@@ -57,7 +57,7 @@ public function __construct()
      */
     public function show($shop, array $payload)
     {
-        $shopData = $this->shopProvider->formatShopData(\Shop::getShop($shop->id));
+        $shopData = $this->shopProvider->formatShopData((array) \Shop::getShop($shop->id));
 
         return [
             'domain' => $shopData['domain'],

From 3abf70e80fa361bf5cd2288901e5d9e2d47e7aab Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Fri, 15 Oct 2021 11:13:55 +0200
Subject: [PATCH 29/30] fix: remove useless check

---
 classes/Module/Install.php        | 4 +---
 classes/Provider/ShopProvider.php | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/classes/Module/Install.php b/classes/Module/Install.php
index bcd18e699..bc67a414f 100644
--- a/classes/Module/Install.php
+++ b/classes/Module/Install.php
@@ -67,9 +67,7 @@ public function installInMenu()
 
             /** @var array $lang */
             foreach (\Language::getLanguages(true) as $lang) {
-                if (is_array($lang)) {
-                    $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
-                }
+                $tab->name[$lang['id_lang']] = $this->module->displayName . ' (' . $k . ')';
             }
 
             $tab->id_parent = -1 == self::PARENT_TAB_NAME ? (int) \Tab::getIdFromClassName((string) self::PARENT_TAB_NAME) : -1;
diff --git a/classes/Provider/ShopProvider.php b/classes/Provider/ShopProvider.php
index f488764bf..80812e1c7 100644
--- a/classes/Provider/ShopProvider.php
+++ b/classes/Provider/ShopProvider.php
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * @param array|bool $shopData
+     * @param array $shopData
      * @param string $psxName
      *
      * @return array
@@ -60,10 +60,6 @@ public function __construct(
      */
     public function formatShopData($shopData, $psxName = '')
     {
-        if (is_bool($shopData)) {
-            return [];
-        }
-
         $configuration = $this->shopContext->getConfiguration();
         $userToken = $this->shopContext->getUserToken();
 

From 31731b3f49313efeb2dd4090dc1ff7123bf1ef45 Mon Sep 17 00:00:00 2001
From: atourneriePresta <anthony.tournerie@prestashop.com>
Date: Wed, 27 Oct 2021 15:52:51 +0200
Subject: [PATCH 30/30] feat: update prestashop_accounts_vue_components version
 to 3.0.0

---
 _dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_dev/package.json b/_dev/package.json
index 43629784b..7b1a34a3b 100644
--- a/_dev/package.json
+++ b/_dev/package.json
@@ -23,7 +23,7 @@
     "moment": "^2.26.0",
     "moment-range": "^4.0.2",
     "prestakit": "^1.1.0",
-    "prestashop_accounts_vue_components": "^2.0.0",
+    "prestashop_accounts_vue_components": "^3.0.0",
     "regenerator-runtime": "^0.13.5",
     "tailwindcss": "^1.8.10",
     "tween.js": "^16.6.0",