Merge pull request #1579 from algolia/feature/MAGE-962

Feature/mage 962 - RC3
algolia · Aug 5, 2024 · a784222 · a784222
2 parents 0165bef + e0a69de
commit a784222
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Helper/AlgoliaHelper.php b/Helper/AlgoliaHelper.php
@@ -326,6 +326,8 @@ public function generateSearchSecuredApiKey(string $key, array $params = []): st
      */
     public function getSettings(string $indexName): array
     {
+        $this->checkClient(__FUNCTION__);
+
         try {
             return $this->client->getSettings($indexName);
         } catch (\Exception $e) {

diff --git a/Setup/Patch/Data/RebuildReplicasPatch.php b/Setup/Patch/Data/RebuildReplicasPatch.php
@@ -2,6 +2,7 @@
 
 namespace Algolia\AlgoliaSearch\Setup\Patch\Data;
 
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
 use Algolia\AlgoliaSearch\Registry\ReplicaState;
 use Algolia\AlgoliaSearch\Service\Product\ReplicaManager;
@@ -12,6 +13,7 @@
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
 
 class RebuildReplicasPatch implements DataPatchInterface
 {
@@ -21,7 +23,9 @@ public function __construct(
         protected ReplicaManager           $replicaManager,
         protected ProductHelper            $productHelper,
         protected AppState                 $appState,
-        protected ReplicaState             $replicaState
+        protected ReplicaState             $replicaState,
+        protected ConfigHelper             $configHelper,
+        protected LoggerInterface          $logger
     )
     {}
 
@@ -48,6 +52,11 @@ public function getAliases(): array
      */
     public function apply(): PatchInterface
     {
+        if (!$this->configHelper->credentialsAreConfigured()) {
+            $this->logger->warning("Algolia credentials are not configured. Aborting replica rebuild patch. If you need to rebuild your replicas run `bin/magento algolia:replicas:rebuild`");
+            return $this;
+        }
+
         $this->moduleDataSetup->getConnection()->startSetup();
         try {
             $this->appState->setAreaCode(Area::AREA_ADMINHTML);