#29880: GraphQL categories and categoryList do not consider Category Permissions configuration

PR review points

Author: pmarjan

app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php

@@ -83,16 +83,17 @@ public function __construct(
      *
      * @param array $criteria
      * @param StoreInterface $store
+     * @param array $attributeNames
      * @param ContextInterface $context
      * @return int[]
      * @throws InputException
      */
-    public function getResult(array $criteria, StoreInterface $store, ContextInterface $context)
+    public function getResult(array $criteria, StoreInterface $store, array $attributeNames, ContextInterface $context)
     {
         $searchCriteria = $this->searchCriteria->buildCriteria($criteria, $store);
         $collection = $this->categoryCollectionFactory->create();
         $this->extensionAttributesJoinProcessor->process($collection);
-        $this->collectionProcessor->process($collection, $searchCriteria, $context);
+        $this->collectionProcessor->process($collection, $searchCriteria, $attributeNames, $context);
 
         /** @var CategorySearchResultsInterface $searchResult */
         $categories = $this->categorySearchResultsFactory->create();

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories/DataProvider/Category/CollectionProcessor/CatalogProcessor.php

@@ -37,12 +37,15 @@ public function __construct(
      *
      * @param Collection $collection
      * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
      * @param ContextInterface|null $context
      * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
+        array $attributeNames,
         ContextInterface $context = null
     ): Collection {
         $this->collectionProcessor->process($searchCriteria, $collection);

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories/DataProvider/Category/CollectionProcessorInterface.php

@@ -21,12 +21,14 @@ interface CollectionProcessorInterface
      *
      * @param Collection $collection
      * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
      * @param ContextInterface|null $context
      * @return Collection
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
+        array $attributeNames,
         ContextInterface $context = null
     ): Collection;
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories/DataProvider/Category/CompositeCollectionProcessor.php

@@ -36,16 +36,18 @@ public function __construct(array $collectionProcessors = [])
      *
      * @param Collection $collection
      * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
      * @param ContextInterface|null $context
      * @return Collection
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
+        array $attributeNames,
         ContextInterface $context = null
     ): Collection {
         foreach ($this->collectionProcessors as $collectionProcessor) {
-            $collection = $collectionProcessor->process($collection, $searchCriteria, $context);
+            $collection = $collectionProcessor->process($collection, $searchCriteria, $attributeNames, $context);
         }
 
         return $collection;

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

@@ -70,7 +70,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         try {
-            $filterResult = $this->categoryFilter->getResult($args, $store, $context);
+            $filterResult = $this->categoryFilter->getResult($args, $store, [], $context);
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }

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

@@ -65,7 +65,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $args['filters']['ids'] = ['eq' => $store->getRootCategoryId()];
         }
         try {
-            $filterResults = $this->categoryFilter->getResult($args, $store, $context);
+            $filterResults = $this->categoryFilter->getResult($args, $store, [], $context);
             $rootCategoryIds = $filterResults['category_ids'];
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));