fix: json post

PrestaShopCorp · Jan 9, 2025 · 19f7e8f · 19f7e8f
1 parent 8aab1e7
commit 19f7e8f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/ps_accounts.php b/ps_accounts.php
@@ -366,6 +366,10 @@ public function getContent()
         /** @var \PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter $psAccountsPresenter */
         $psAccountsPresenter = $this->getService(\PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter::class);
 
+        /** @var \PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider $rsaKeysProvider */
+        $rsaKeysProvider = $this->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
+        $rsaKeysProvider->getOrGenerateAccountsRsaPublicKey();
+
         Media::addJsDef([
             'contextPsAccounts' => $psAccountsPresenter->present((string) $this->name),
         ]);

diff --git a/src/Api/Controller/AbstractRestController.php b/src/Api/Controller/AbstractRestController.php
@@ -285,11 +285,15 @@ protected function decodePayload($defaultShopId = null)
                 $this->setContextShop($shop);
                 $publicKey = $shopKeysService->getPublicKey();
 
+                $this->module->getLogger()->debug('trying to verify token with pkey: ' . $publicKey);
+
                 if (
                     !empty($publicKey) &&
                     is_string($publicKey) &&
                     true === $jwt->verify(new Sha256(), new Key((string) $publicKey))
                 ) {
+                    $this->module->getLogger()->debug('token verified: ' . $jwtString);
+
                     return $jwt->claims()->all();
                 }
                 $this->module->getLogger()->error('Failed to verify token: ' . $jwtString);

diff --git a/src/Hook/ActionShopAccountUnlinkAfter.php b/src/Hook/ActionShopAccountUnlinkAfter.php
@@ -56,7 +56,8 @@ public function execute(array $params = [])
         $rsaKeysProvider = $this->module->getService(RsaKeysProvider::class);
         try {
             $rsaKeysProvider->cleanupKeys();
-            $rsaKeysProvider->generateKeys();
+            // FIXME: We MUST generate a new key here to avoid concurrent key re-generation at Presenter display time
+            //$rsaKeysProvider->generateKeys();
         } catch (\Exception $e) {
         }
     }

diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
@@ -131,18 +131,12 @@ public function generateKeys($refresh = false)
     }
 
     /**
-     * @return string|bool|null
+     * @return string|null
      */
     public function getOrGenerateAccountsRsaPublicKey()
     {
-        $publicKey = $this->getPublicKey();
-        if ($publicKey) {
-            return $publicKey;
-        }
-
         try {
-            $this->regenerateKeys();
-
+            $this->generateKeys();
             return $this->getPublicKey();
         } catch (\Exception $e) {
             return null;
@@ -164,15 +158,15 @@ public function regenerateKeys()
      */
     public function hasKeys()
     {
-        return false === empty($this->configuration->getAccountsRsaPublicKey());
+        return false === empty($this->configuration->getAccountsRsaPublicKey(false, false));
     }
 
     /**
      * @return string|bool
      */
     public function getPublicKey()
     {
-        return $this->configuration->getAccountsRsaPublicKey();
+        return $this->configuration->getAccountsRsaPublicKey(false, false);
     }
 
     /**

diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
@@ -87,7 +87,8 @@ public function formatShopData(array $shopData, $psxName = '', $refreshTokens =
 
                 // LinkAccount
                 'uuid' => $linkShop->getShopUuid() ?: null,
-                'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
+                //'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
+                'publicKey' => $rsaKeyProvider->getPublicKey() ?: null,
                 'employeeId' => (int) $linkShop->getEmployeeId() ?: null,
                 'user' => [
                     'email' => $linkShop->getOwnerEmail() ?: null,

diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
@@ -215,11 +215,14 @@ public function updateAccountsRsaPrivateKey($key)
     }
 
     /**
+     * @param bool $cached
+     * @param bool|mixed $default
+     *
      * @return string|bool
      */
-    public function getAccountsRsaPublicKey()
+    public function getAccountsRsaPublicKey($default = false, $cached = false)
     {
-        return $this->configuration->get(ConfigurationKeys::PS_ACCOUNTS_RSA_PUBLIC_KEY);
+        return $this->configuration->get(ConfigurationKeys::PS_ACCOUNTS_RSA_PUBLIC_KEY, $default, $cached);
     }
 
     /**