Merge pull request #1641 from algolia/epic/MAGE-978-multi-app-ids

MAGE-978: Multi-Application IDs
algolia · Nov 14, 2024 · 719c790 · 719c790
2 parents 02a9ebd + 748020e
commit 719c790
Show file tree

Hide file tree

Showing 35 changed files with 1,361 additions and 1,434 deletions.
diff --git a/Block/Adminhtml/LandingPage/SearchConfiguration.php b/Block/Adminhtml/LandingPage/SearchConfiguration.php
@@ -22,9 +22,6 @@ class SearchConfiguration extends \Magento\Backend\Block\Template
     /** @var Data */
     private $coreHelper;
 
-    /** @var int */
-    protected $planLevel;
-
     /**
      * @param Context $context
      * @param SessionManagerInterface $backendSession

diff --git a/Helper/AdapterHelper.php b/Helper/AdapterHelper.php
@@ -4,42 +4,22 @@
 
 use Algolia\AlgoliaSearch\Helper\Adapter\FiltersHelper;
 use Algolia\AlgoliaSearch\Helper\Data as AlgoliaDataHelper;
+use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
 use Magento\CatalogSearch\Helper\Data as CatalogSearchDataHelper;
 
 class AdapterHelper
 {
     public const INSTANTSEARCH_ORDER_PARAM = 'sortBy';
     public const BACKEND_ORDER_PARAM = 'product_list_order';
 
-    /** @var CatalogSearchDataHelper */
-    private $catalogSearchHelper;
-
-    /** @var AlgoliaDataHelper */
-    private $algoliaHelper;
-
-    /** @var FiltersHelper */
-    private $filtersHelper;
-
-    /** @var ConfigHelper */
-    private $configHelper;
-
-    /**
-     * @param CatalogSearchDataHelper $catalogSearchHelper
-     * @param AlgoliaDataHelper $algoliaHelper
-     * @param FiltersHelper $filtersHelper
-     * @param ConfigHelper $configHelper
-     */
     public function __construct(
-        CatalogSearchDataHelper $catalogSearchHelper,
-        AlgoliaDataHelper $algoliaHelper,
-        FiltersHelper $filtersHelper,
-        ConfigHelper $configHelper
-    ) {
-        $this->catalogSearchHelper = $catalogSearchHelper;
-        $this->algoliaHelper = $algoliaHelper;
-        $this->filtersHelper = $filtersHelper;
-        $this->configHelper = $configHelper;
-    }
+        protected CatalogSearchDataHelper $catalogSearchHelper,
+        protected AlgoliaDataHelper $algoliaHelper,
+        protected FiltersHelper $filtersHelper,
+        protected ConfigHelper $configHelper,
+        protected AlgoliaCredentialsManager $algoliaCredentialsManager
+    )
+    {}
 
     /**
      * Get search result from Algolia
@@ -142,8 +122,7 @@ public function isAllowed()
         $storeId = $this->getStoreId();
 
         return
-            $this->configHelper->getApplicationID($storeId)
-            && $this->configHelper->getAPIKey($storeId)
+            $this->algoliaCredentialsManager->checkCredentials($storeId)
             && $this->configHelper->isEnabledFrontEnd($storeId)
             && $this->configHelper->makeSeoRequest($storeId);
     }