[ACCOUNT-2706] fix: getUncachedConfiguration single shop context (#436)

* fix: getUncachedConfiguration single shop context * fix: don't fix the tests, fix the code !
PrestaShopCorp · Oct 4, 2024 · 811ba50 · 811ba50
1 parent a657573
commit 811ba50
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 22 deletions.
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
@@ -176,21 +176,21 @@ protected function getAccessToken($shopUid)
     }
 
     /**
-     * @param int $waitForOAuth2ClientSeconds
+     * @param int $oauth2ClientReceiptTimeout
      *
      * @return void
      *
      * @throws InconsistentAssociationStateException
      */
-    protected function assertAssociationState($waitForOAuth2ClientSeconds = 60)
+    protected function assertAssociationState($oauth2ClientReceiptTimeout = 60)
     {
         $linkedAtTs = $currentTs = time();
         if ($this->linkShop->linkedAt()) {
             $linkedAtTs = (new \DateTime($this->linkShop->linkedAt()))->getTimestamp();
         }
 
         if ($this->linkShop->exists() &&
-            $currentTs - $linkedAtTs > $waitForOAuth2ClientSeconds &&
+            $currentTs - $linkedAtTs > $oauth2ClientReceiptTimeout &&
             !$this->oauth2ClientProvider->getOauth2Client()->exists()) {
             throw new InconsistentAssociationStateException('Invalid OAuth2 client');
         }

diff --git a/src/Adapter/Configuration.php b/src/Adapter/Configuration.php
@@ -183,35 +183,30 @@ public function setGlobal($key, $values, $html = false)
      * @param string|bool $default
      *
      * @return mixed
-     *
-     * @throws \PrestaShopDatabaseException
-     * @throws \PrestaShopException
      */
     public function getUncached($key, $idShopGroup = null, $idShop = null, $default = false)
     {
-        $id = \Configuration::getIdByName($key, $idShopGroup, $idShop);
-        if ($id > 0) {
-            $found = (new \Configuration($id));
-            $found->clearCache();
-
-            return $found->value;
+        try {
+            return $this->getUncachedConfiguration($key, $idShopGroup, $idShop)->value;
+        } catch (\Exception $e) {
+            return $default;
         }
-
-        return $default;
     }
 
     /**
      * @param string $key
      * @param int|null $idShopGroup
      * @param int|null $idShop
-     * @param mixed $default
      *
      * @return \Configuration
      *
      * @throw \Exception
      */
-    public function getUncachedConfiguration($key, $idShopGroup = null, $idShop = null, $default = false)
+    public function getUncachedConfiguration($key, $idShopGroup = null, $idShop = null)
     {
+        if (!$this->isMultishopActive()) {
+            $idShopGroup = $idShop = null;
+        }
         $id = \Configuration::getIdByName($key, $idShopGroup, $idShop);
         if ($id > 0) {
             $found = (new \Configuration($id));
@@ -220,6 +215,18 @@ public function getUncachedConfiguration($key, $idShopGroup = null, $idShop = nu
             return $found;
         }
 
-        throw new \Exception('Configuration entry not found');
+        throw new \Exception('Configuration entry not found: ' . $key . '|grp:' . $idShopGroup . '|shop:' . $idShop);
+    }
+
+    /**
+     * is multi-shop active "right now"
+     *
+     * @return bool
+     */
+    public function isMultishopActive()
+    {
+        //return \Shop::isFeatureActive();
+        return \Db::getInstance()->getValue('SELECT value FROM `' . _DB_PREFIX_ . 'configuration` WHERE `name` = "PS_MULTISHOP_FEATURE_ACTIVE"')
+            && (\Db::getInstance()->getValue('SELECT COUNT(*) FROM ' . _DB_PREFIX_ . 'shop') > 1);
     }
 }
diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
@@ -177,6 +177,8 @@ public function getShopUuidDateUpd()
 
             return $entry->date_upd;
         } catch (\Exception $e) {
+            Logger::getInstance()->error(__METHOD__ . ': ' . $e->getMessage());
+
             return null;
         }
     }
@@ -386,8 +388,7 @@ public function fixMultiShopConfig()
     public function isMultishopActive()
     {
         //return \Shop::isFeatureActive();
-        return \Db::getInstance()->getValue('SELECT value FROM `' . _DB_PREFIX_ . 'configuration` WHERE `name` = "PS_MULTISHOP_FEATURE_ACTIVE"')
-            && (\Db::getInstance()->getValue('SELECT COUNT(*) FROM ' . _DB_PREFIX_ . 'shop') > 1);
+        return $this->configuration->isMultishopActive();
     }
 
     /**

diff --git a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
@@ -64,9 +64,6 @@ function setUp(): void
             $commandBus
         );
 
-        // Fix single shop context
-        $this->configuration->setIdShop(null);
-        $this->configuration->setIdShopGroup(null);
         $this->shopSession->cleanup();
     }