magento/adobe-stock-integration#1760: Media Gallery page and Category grid page opened successfully if "Enhanced Media Gallery" disabled - redirect to 404 if enhanced media gallery config is disabled.

Author: jmonteros422

app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php

@@ -8,10 +8,13 @@
 namespace Magento\MediaGalleryCatalogUi\Controller\Adminhtml\Category;
 
 use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Page;
+use Magento\Backend\Model\View\Result\Forward;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Controller serving the media gallery content
@@ -20,13 +23,39 @@ class Index extends Action implements HttpGetActionInterface
 {
     public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
 
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * Index constructor.
+     * @param Context $context
+     * @param Config $config
+     */
+    public function __construct(
+        Context $context,
+        Config $config
+    ) {
+        parent::__construct($context);
+        $this->config = $config;
+    }
+
     /**
      * Get the media gallery layout
      *
      * @return ResultInterface
      */
     public function execute(): ResultInterface
     {
+        if (!$this->config->isEnabled()) {
+            /** @var Forward $resultForward */
+            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
+            $resultForward->forward('noroute');
+
+            return $resultForward;
+        }
+
         /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->getConfig()->getTitle()->prepend(__('Categories'));

app/code/Magento/MediaGalleryCatalogUi/composer.json

@@ -8,7 +8,8 @@
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/module-ui": "*",
+        "magento/module-media-content-api": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php

@@ -12,6 +12,9 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\MediaContentApi\Model\Config;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Forward;
 
 /**
  * Controller serving the media gallery content
@@ -20,13 +23,39 @@ class Index extends Action implements HttpGetActionInterface
 {
     public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
 
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * Index constructor.
+     * @param Context $context
+     * @param Config $config
+     */
+    public function __construct(
+        Context $context,
+        Config $config
+    ) {
+        parent::__construct($context);
+        $this->config = $config;
+    }
+
     /**
      * Get the media gallery layout
      *
      * @return ResultInterface
      */
     public function execute(): ResultInterface
     {
+        if (!$this->config->isEnabled()) {
+            /** @var Forward $resultForward */
+            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
+            $resultForward->forward('noroute');
+
+            return $resultForward;
+        }
+
         /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->setActiveMenu('Magento_MediaGalleryUi::media_gallery')