MC-42528: [GraphQl]Categories and categoryList queries ignore the Category permission to hide categories in a shared catalog

Author: Oleksandr Iegorov

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

@@ -7,10 +7,13 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\CatalogGraphQl\Model\Category\CategoryFilter;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ExtractDataFromCategoryTree;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ArgumentsProcessorInterface;
@@ -81,22 +84,39 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
-        return $this->fetchCategories($rootCategoryIds, $info, (int) $store->getId());
+        return $this->fetchCategories($rootCategoryIds, $info, $processedArgs, $store, [], $context);
     }
 
     /**
      * Fetch category tree data
      *
      * @param array $categoryIds
      * @param ResolveInfo $info
-     * @param int $storeId
+     * @param array $criteria
+     * @param StoreInterface $store
+     * @param array $attributeNames
+     * @param ContextInterface $context
      * @return array
+     * @throws LocalizedException
      */
-    private function fetchCategories(array $categoryIds, ResolveInfo $info, int $storeId)
-    {
+    private function fetchCategories(
+        array $categoryIds,
+        ResolveInfo $info,
+        array $criteria,
+        StoreInterface $store,
+        array $attributeNames,
+        $context
+    ) : array {
         $fetchedCategories = [];
         foreach ($categoryIds as $categoryId) {
-            $categoryTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
+            $categoryTree = $this->categoryTree->getFilteredTree(
+                $info,
+                $categoryId,
+                $criteria,
+                $store,
+                $attributeNames,
+                $context
+            );
             if (empty($categoryTree)) {
                 continue;
             }

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

@@ -9,15 +9,23 @@
 
 use GraphQL\Language\AST\FieldNode;
 use GraphQL\Language\AST\NodeKind;
+
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\CatalogGraphQl\Model\AttributesJoiner;
 use Magento\CatalogGraphQl\Model\Category\DepthCalculator;
 use Magento\CatalogGraphQl\Model\Category\LevelCalculator;
+use Magento\CatalogGraphQl\Model\Resolver\Categories\DataProvider\Category\CollectionProcessorInterface;
+use Magento\CatalogGraphQl\Model\Category\Filter\SearchCriteria;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Exception\LocalizedException;
+use \Exception;
+use \Iterator;
 
 /**
  * Category tree data provider
@@ -54,25 +62,41 @@ class CategoryTree
      */
     private $metadata;
 
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var SearchCriteria
+     */
+    private $searchCriteria;
+
     /**
      * @param CollectionFactory $collectionFactory
      * @param AttributesJoiner $attributesJoiner
      * @param DepthCalculator $depthCalculator
      * @param LevelCalculator $levelCalculator
      * @param MetadataPool $metadata
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param SearchCriteria $searchCriteria
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         AttributesJoiner $attributesJoiner,
         DepthCalculator $depthCalculator,
         LevelCalculator $levelCalculator,
-        MetadataPool $metadata
+        MetadataPool $metadata,
+        CollectionProcessorInterface $collectionProcessor,
+        SearchCriteria $searchCriteria
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->attributesJoiner = $attributesJoiner;
         $this->depthCalculator = $depthCalculator;
         $this->levelCalculator = $levelCalculator;
         $this->metadata = $metadata;
+        $this->collectionProcessor = $collectionProcessor;
+        $this->searchCriteria = $searchCriteria;
     }
 
     /**
@@ -81,11 +105,27 @@ public function __construct(
      * @param ResolveInfo $resolveInfo
      * @param int $rootCategoryId
      * @param int $storeId
-     * @return \Iterator
+     * @return Iterator
+     * @throws LocalizedException
+     * @throws Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId, int $storeId): \Iterator
+    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId, int $storeId): Iterator
     {
+        $collection = $this->getCollection($resolveInfo, $rootCategoryId);
+        return $collection->getIterator();
+    }
+
+    /**
+     * Return prepared collection
+     *
+     * @param ResolveInfo $resolveInfo
+     * @param int $rootCategoryId
+     * @return Collection
+     * @throws LocalizedException
+     * @throws Exception
+     */
+    private function getCollection(ResolveInfo $resolveInfo, int $rootCategoryId) : Collection {
         $categoryQuery = $resolveInfo->fieldNodes[0];
         $collection = $this->collectionFactory->create();
         $this->joinAttributesRecursively($collection, $categoryQuery, $resolveInfo);
@@ -119,7 +159,7 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId, int $stor
             $rootCategoryId
         );
 
-        return $collection->getIterator();
+        return $collection;
     }
 
     /**
@@ -150,4 +190,31 @@ private function joinAttributesRecursively(
             $this->joinAttributesRecursively($collection, $node, $resolveInfo);
         }
     }
+
+    /**
+     * Returns categories tree starting from parent $rootCategoryId with filtration
+     *
+     * @param ResolveInfo $resolveInfo
+     * @param int $rootCategoryId
+     * @param array $criteria
+     * @param StoreInterface $store
+     * @param array $attributeNames
+     * @param ContextInterface $context
+     * @return Iterator
+     * @throws LocalizedException
+     * @throws Exception
+     */
+    public function getFilteredTree(
+        ResolveInfo $resolveInfo,
+        int $rootCategoryId,
+        array $criteria,
+        StoreInterface $store,
+        array $attributeNames,
+        ContextInterface $context
+    ): Iterator {
+        $searchCriteria = $this->searchCriteria->buildCriteria($criteria, $store);
+        $collection = $this->getCollection($resolveInfo, $rootCategoryId);
+        $this->collectionProcessor->process($collection, $searchCriteria, $attributeNames, $context);
+        return $collection->getIterator();
+    }
 }

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

@@ -157,6 +157,9 @@ private function sortTree(array $tree): array
                     return $element1['position'] > $element2['position'];
                 });
                 $node['children'] = $this->sortTree($node['children']);
+                if ($node['children_count']) {
+                    $node['children_count'] = count($node['children']);
+                }
             }
         }