feat : add owner_email & owner_uid values on link shop

PrestaShopCorp · Feb 13, 2024 · 48c436b · 48c436b
1 parent 1ced5b6
commit 48c436b
Show file tree

Hide file tree

Showing 19 changed files with 144 additions and 128 deletions.
diff --git a/config.xml b/config.xml
@@ -10,4 +10,4 @@
     <is_configurable>1</is_configurable>
     <need_instance>0</need_instance>
 	<limited_countries></limited_countries>
-</module>
+</module>
diff --git a/config/common.yml b/config/common.yml
@@ -110,6 +110,12 @@ services:
     arguments:
       - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
 
+  PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory:
+    class: PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory
+    public: true
+    arguments:
+      - '@PrestaShop\Module\PsAccounts\Adapter\Configuration'
+
   #####################
   # handlers
 

diff --git a/controllers/front/apiV1ShopLinkAccount.php b/controllers/front/apiV1ShopLinkAccount.php
@@ -59,6 +59,8 @@ public function update(Shop $shop, UpdateShopLinkAccountRequest $request)
             new LinkShop([
                 'shopId' => $request->shop_id,
                 'uid' => $request->uid,
+                'ownerUid' => $request->owner_uid,
+                'ownerEmail' => $request->owner_email,
                 'employeeId' => $request->employee_id,
             ])
         ));

diff --git a/ps_accounts.php b/ps_accounts.php
@@ -80,7 +80,6 @@ class Ps_accounts extends Module
 //        \PrestaShop\Module\PsAccounts\Hook\ActionAdminControllerInitBefore::class,
         \PrestaShop\Module\PsAccounts\Hook\ActionAdminLoginControllerLoginAfter::class,
         \PrestaShop\Module\PsAccounts\Hook\ActionAdminLoginControllerSetMedia::class,
-        \PrestaShop\Module\PsAccounts\Hook\ActionModuleInstallAfter::class,
         \PrestaShop\Module\PsAccounts\Hook\ActionObjectShopAddAfter::class,
         \PrestaShop\Module\PsAccounts\Hook\ActionObjectShopDeleteAfter::class,
         \PrestaShop\Module\PsAccounts\Hook\ActionObjectShopDeleteBefore::class,
@@ -173,9 +172,7 @@ public function install()
             && $this->addCustomHooks($this->customHooks)
             && $this->registerHook($this->getHooksToRegister());
 
-        $this->installEventBus();
-        $this->fixMultiShopConfig();
-        $this->autoReonboardOnV5();
+        $this->onModuleInstallAfter();
 
         $this->getLogger()->info('Install - Loading ' . $this->name . ' Env : [' . $this->getModuleEnv() . ']');
 
@@ -517,4 +514,28 @@ private function installEventBus()
             $moduleInstaller->installModule('ps_eventbus');
         }
     }
+
+    /**
+     * @return void
+     *
+     * @throws Exception
+     */
+    private function onModuleInstallAfter()
+    {
+        /** @var \PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory $circuitBreakerFactory */
+        $circuitBreakerFactory = $this->getService(\PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory::class);
+        $circuitBreakerFactory->resetAll();
+
+        /** @var \PrestaShop\Module\PsAccounts\Cqrs\CommandBus $commandBus */
+        $commandBus = $this->getService(\PrestaShop\Module\PsAccounts\Cqrs\CommandBus::class);
+        $commandBus->handle(new \PrestaShop\Module\PsAccounts\Account\Command\UpdateModuleCommand(
+            new \PrestaShop\Module\PsAccounts\Account\Dto\UpdateModule([
+                'version' => \Ps_accounts::VERSION,
+            ])
+        ));
+
+        $this->installEventBus();
+        $this->fixMultiShopConfig();
+        $this->autoReonboardOnV5();
+    }
 }
diff --git a/src/Account/Dto/LinkShop.php b/src/Account/Dto/LinkShop.php
@@ -30,15 +30,15 @@ class LinkShop extends Dto
     public $uid;
     /** @var string */
     public $employeeId = '';
-
-//    /** @var string */
-//    public $ownerUid;
-//
-//    /** @var string */
-//    public $ownerEmail;
+    /** @var string */
+    public $ownerUid;
+    /** @var string */
+    public $ownerEmail;
 
     protected $mandatory = [
         'shopId',
         'uid',
+//        'ownerUid',
+//        'ownerEmail',
     ];
 }
diff --git a/src/Account/LinkShop.php b/src/Account/LinkShop.php
@@ -49,6 +49,8 @@ public function delete()
     {
         $this->setShopUuid(null);
         $this->setEmployeeId(null);
+        $this->setOwnerUuid(null);
+        $this->setOwnerEmail(null);
     }
 
     /**
@@ -60,6 +62,8 @@ public function update(Dto\LinkShop $payload)
     {
         $this->setShopUuid($payload->uid);
         $this->setEmployeeId((int) $payload->employeeId ?: null);
+        $this->setOwnerUuid($payload->ownerUid);
+        $this->setOwnerEmail($payload->ownerEmail);
     }
 
     /**
@@ -123,12 +127,11 @@ public function setEmployeeId($employeeId)
     }
 
     /**
-     * @return string|null
+     * @return int
      */
     public function getOwnerUuid()
     {
-        // FIXME: implement method
-        //return (int) $this->configuration->getEmployeeId();
+        return (int) $this->configuration->getUserFirebaseUuid();
     }
 
     /**
@@ -138,8 +141,7 @@ public function getOwnerUuid()
      */
     public function setOwnerUuid($uuid)
     {
-        // FIXME: implement method
-        //$this->configuration->updateEmployeeId((string) $uuid);
+        $this->configuration->updateUserFirebaseUuid((string) $uuid);
     }
 
     /**

diff --git a/src/Account/Session/Firebase/OwnerSession.php b/src/Account/Session/Firebase/OwnerSession.php
@@ -82,7 +82,6 @@ public function getToken()
     public function cleanup()
     {
         $this->configurationRepository->updateUserFirebaseIdToken('');
-        $this->configurationRepository->updateFirebaseEmail('');
     }
 
     /**
@@ -93,11 +92,6 @@ public function cleanup()
      */
     public function setToken($token, $refreshToken = null)
     {
-        $parsed = (new Parser())->parse((string) $token);
-
-        $uuid = $parsed->claims()->get(Token::ID_OWNER_CLAIM);
         $this->configurationRepository->updateUserFirebaseIdToken($token);
-
-        $this->configurationRepository->updateFirebaseEmail($parsed->claims()->get('email'));
     }
 }
diff --git a/src/Account/Session/Firebase/ShopSession.php b/src/Account/Session/Firebase/ShopSession.php
@@ -81,7 +81,6 @@ public function getToken()
      */
     public function cleanup()
     {
-        $this->configurationRepository->updateShopUuid('');
         $this->configurationRepository->updateFirebaseIdAndRefreshTokens('', '');
     }
 
@@ -93,9 +92,6 @@ public function cleanup()
      */
     public function setToken($token, $refreshToken = null)
     {
-        $parsed = (new Parser())->parse($token);
-
-        $this->configurationRepository->updateShopUuid($parsed->claims()->get(Token::ID_OWNER_CLAIM));
         $this->configurationRepository->updateFirebaseIdAndRefreshTokens($token, $refreshToken);
     }
 }
diff --git a/src/Repository/ConfigurationKeys.php → src/Adapter/ConfigurationKeys.php b/src/Repository/ConfigurationKeys.php → src/Adapter/ConfigurationKeys.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Repository;
+namespace PrestaShop\Module\PsAccounts\Adapter;
 
 use PrestaShop\Module\PsAccounts\Type\Enum;
 
@@ -31,6 +31,7 @@ class ConfigurationKeys extends Enum
 
     // PS User Account
     const PS_ACCOUNTS_USER_FIREBASE_ID_TOKEN = 'PS_ACCOUNTS_USER_FIREBASE_ID_TOKEN';
+    const PS_ACCOUNTS_USER_FIREBASE_UUID = 'PS_ACCOUNTS_USER_FIREBASE_UUID';
     /* @deprecated */
     const PS_ACCOUNTS_FIREBASE_EMAIL = 'PS_ACCOUNTS_FIREBASE_EMAIL';
 

diff --git a/src/Api/Controller/Request/UpdateShopLinkAccountRequest.php b/src/Api/Controller/Request/UpdateShopLinkAccountRequest.php
@@ -25,17 +25,13 @@ class UpdateShopLinkAccountRequest extends Request
     /** @var string */
     public $shop_id;
     /** @var string */
-    public $shop_refresh_token;
-    /** @var string */
-    public $user_refresh_token;
-    /** @var string */
-    public $shop_token;
-    /** @var string */
-    public $user_token;
-    /** @var string */
     public $employee_id = '';
     /** @var string */
     public $uid;
+    /** @var string */
+    public $owner_uid;
+    /** @var string */
+    public $owner_email;
 
     /**
      * @var string[]

diff --git a/src/Factory/CircuitBreakerFactory.php b/src/Factory/CircuitBreakerFactory.php
@@ -31,15 +31,29 @@ class CircuitBreakerFactory
     /**
      * @var array
      */
-    private static $provides = [
+    private $provides = [
         AccountsClient::class,
         IndirectChannelClient::class,
     ];
 
     /**
      * @var array
      */
-    private static $instances = [];
+    private $instances = [];
+
+    /**
+     * @var Configuration
+     */
+    private $configStorage;
+
+    /**
+     * @param Configuration $configStorage
+     */
+    public function __construct(
+        Configuration $configStorage
+    ) {
+        $this->configStorage = $configStorage;
+    }
 
     /**
      * @param string $resourceId
@@ -48,20 +62,19 @@ class CircuitBreakerFactory
      *
      * @throws \Exception
      */
-    public static function create($resourceId)
+    public function createInstance($resourceId)
     {
-        /** @var \Ps_accounts $module */
-        $module = \Module::getInstanceByName('ps_accounts');
-        /** @var Configuration $config */
-        $config = $module->getService(Configuration::class);
-
-        $instance = new PersistentCircuitBreaker($resourceId, 'PS_ACCOUNTS', $config);
+        $instance = new PersistentCircuitBreaker(
+            static::className($resourceId),
+            'PS_ACCOUNTS',
+            $this->configStorage
+        );
         $instance->setDefaultFallbackResponse([
             'status' => false,
             'httpCode' => 500,
             'body' => ['message' => 'Circuit Breaker Open'],
         ]);
-        static::$instances[$resourceId] = $instance;
+        $this->instances[$resourceId] = $instance;
 
         return $instance;
     }
@@ -73,24 +86,52 @@ public static function create($resourceId)
      *
      * @throws \Exception
      */
-    public static function getOrCreate($resourceId)
+    public function getOrCreate($resourceId)
     {
-        if (!array_key_exists($resourceId, static::$instances)) {
-            static::create($resourceId);
+        if (!array_key_exists($resourceId, $this->instances)) {
+            static::createInstance($resourceId);
         }
 
-        return static::$instances[$resourceId];
+        return $this->instances[$resourceId];
     }
 
     /**
      * @return void
      *
      * @throws \Exception
      */
-    public static function resetAll()
+    public function resetAll()
     {
-        foreach (static::$provides as $class) {
+        foreach ($this->provides as $class) {
             static::getOrCreate($class)->reset();
         }
     }
+
+    /**
+     * @param string $resourceId
+     *
+     * @return CircuitBreaker
+     *
+     * @throws \Exception
+     */
+    public static function create($resourceId)
+    {
+        /** @var \Ps_accounts $module */
+        $module = \Module::getInstanceByName('ps_accounts');
+
+        /** @var CircuitBreakerFactory $factory */
+        $factory = $module->getService(CircuitBreakerFactory::class);
+
+        return $factory->createInstance($resourceId);
+    }
+
+    /**
+     * @param string $className
+     *
+     * @return string
+     */
+    protected function className($className)
+    {
+        return strtoupper(preg_replace(["/^.*\\\\/", "/([^A-Z])([A-Z])/"], ["", "$1_$2"], $className));
+    }
 }
diff --git a/src/Hook/ActionModuleInstallAfter.php b/src/Hook/ActionModuleInstallAfter.php