Merge remote-tracking branch 'marjan/search-configuration-permissions-29927' into catalog-permissions-29880

Author: cpartica

app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php

@@ -8,14 +8,11 @@
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
 use Magento\CatalogGraphQl\Model\Resolver\Products\Query\ProductQueryInterface;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
-use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
-use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\SearchFilter;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Catalog\Model\Layer\Resolver;
 use Magento\CatalogGraphQl\DataProvider\Product\SearchCriteriaBuilder;
 
@@ -57,17 +54,7 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if ($args['currentPage'] < 1) {
-            throw new GraphQlInputException(__('currentPage value must be greater than 0.'));
-        }
-        if ($args['pageSize'] < 1) {
-            throw new GraphQlInputException(__('pageSize value must be greater than 0.'));
-        }
-        if (!isset($args['search']) && !isset($args['filter'])) {
-            throw new GraphQlInputException(
-                __("'search' or 'filter' input argument is required.")
-            );
-        }
+        $this->validateInput($args);
 
         $searchResult = $this->searchQuery->getResult($args, $info, $context);
 
@@ -94,4 +81,29 @@ public function resolve(
 
         return $data;
     }
+
+    /**
+     * Validate input arguments
+     *
+     * @param array $args
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlInputException
+     */
+    private function validateInput(array $args)
+    {
+        if (isset($args['searchAllowed']) && $args['searchAllowed'] === false) {
+            throw new GraphQlAuthorizationException(__('Product search has been disabled.'));
+        }
+        if ($args['currentPage'] < 1) {
+            throw new GraphQlInputException(__('currentPage value must be greater than 0.'));
+        }
+        if ($args['pageSize'] < 1) {
+            throw new GraphQlInputException(__('pageSize value must be greater than 0.'));
+        }
+        if (!isset($args['search']) && !isset($args['filter'])) {
+            throw new GraphQlInputException(
+                __("'search' or 'filter' input argument is required.")
+            );
+        }
+    }
 }