ACP2E-2300: allow in sitemap only categories and products from public shared catalog based on catalog permissions instead of shared catalog.

Author: alzota

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php

@@ -48,9 +48,9 @@ class Category extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     protected $metadataPool;
 
     /**
-     * @var ManagerInterface
+     * @var SelectWrapper
      */
-    private $eventManager;
+    private $selectWrapper;
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
@@ -66,13 +66,13 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category $categoryResource,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
         $connectionName = null,
-        ManagerInterface $eventManager = null
+        SelectWrapper $selectWrapper = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_categoryResource = $categoryResource;
         parent::__construct($context, $connectionName);
         $this->metadataPool = $metadataPool;
-        $this->eventManager = $eventManager ?? ObjectManager::getInstance()->get(ManagerInterface::class);
+        $this->selectWrapper = $selectWrapper ?? ObjectManager::getInstance()->get(SelectWrapper::class);
     }
 
     /**
@@ -132,12 +132,9 @@ public function getCollection($storeId)
 
         $this->_addFilter($storeId, 'is_active', 1);
 
-        $this->eventManager->dispatch(
-            'sitemap_category_select_init',
-            ['select' => $this->_select]
+        $query = $connection->query(
+            $this->selectWrapper->getSelectStatement($this->_select)
         );
-
-        $query = $connection->query($this->_select);
         while ($row = $query->fetch()) {
             $category = $this->_prepareCategory($row);
             $categories[$category->getId()] = $category;

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/SelectWrapper.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+
+namespace Magento\Sitemap\Model\ResourceModel\Catalog;
+
+use Magento\Framework\DB\Select;
+
+class SelectWrapper
+{
+    /**
+     * Allow to modify select statement with plugins
+     *
+     * @param Select $select
+     * @return Select
+     */
+    public function getSelectStatement(Select $select)
+    {
+        return $select;
+    }
+}