Prevent plugin to handle suggest query

Elastic-Suite · Jun 9, 2023 · c1e09b2 · c1e09b2
1 parent dc01197
commit c1e09b2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/Api/AbstractClient.php b/src/Api/AbstractClient.php
@@ -14,17 +14,20 @@ class AbstractClient
     protected AuthenticationTokenProvider $tokenProvider;
     protected Configuration $configuration;
     protected LoggerInterface $logger;
+    protected string $kernelEnv;
     protected ?string $token = null;
     protected bool $debug;
 
     public function __construct(
         AuthenticationTokenProvider $tokenProvider,
         Configuration $configuration,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        string $kernelEnv
     ){
         $this->tokenProvider = $tokenProvider;
         $this->configuration = $configuration;
         $this->logger        = $logger;
+        $this->kernelEnv     = $kernelEnv;
         $this->debug         = false;
     }
 

diff --git a/src/Api/GraphQlClient.php b/src/Api/GraphQlClient.php
@@ -13,8 +13,7 @@ class GraphQlClient extends AbstractClient
 {
     public function query(string $query, array $variables): ?ResponseInterface
     {
-        // TODO add verify false only for dev env.
-        $client = new Client(['verify' => false,]);
+        $client = new Client($this->kernelEnv !== 'prod' ? ['verify' => false] : []);
 
         try {
             if ($this->debug === true) {

diff --git a/src/Api/RestClient.php b/src/Api/RestClient.php
@@ -18,8 +18,7 @@ public function query($endpoint, $operation, ...$input)
             ->setApiKeyPrefix('Authorization', 'Bearer')
             ->setHost($this->configuration->getBaseUrl());
 
-        // TODO add verify false only for dev env.
-        $apiInstance = new $endpoint(new Client(['verify' => false]), $config);
+        $apiInstance = new $endpoint(new Client($this->kernelEnv !== 'prod' ? ['verify' => false] : []), $config);
 
         try {
             if ($this->debug === true) {

diff --git a/src/Resources/config/services/api.xml b/src/Resources/config/services/api.xml
@@ -10,6 +10,7 @@
             <argument type="service" id="Gally\ShopwarePlugin\Api\AuthenticationTokenProvider" />
             <argument type="service" id="Gally\ShopwarePlugin\Service\Configuration" />
             <argument type="service" id="logger"/>
+            <argument>%kernel.environment%</argument>
         </service>
         <service id="Gally\ShopwarePlugin\Api\RestClient" parent="Gally\ShopwarePlugin\Api\AbstractClient"/>
         <service id="Gally\ShopwarePlugin\Api\GraphQlClient" parent="Gally\ShopwarePlugin\Api\AbstractClient"/>

diff --git a/src/Search/ProductSearchBuilder.php b/src/Search/ProductSearchBuilder.php
@@ -27,7 +27,9 @@ public function __construct(
 
     public function build(Request $request, Criteria $criteria, SalesChannelContext $context): void
     {
-        if (!$this->configuration->isActive($context->getSalesChannelId())) {
+        if (!$this->configuration->isActive($context->getSalesChannelId())
+            || $request->getPathInfo() === '/suggest' // Gally does not handle suggest request yet
+        ) {
             $this->decorated->build($request, $criteria, $context);
         }