fix(urlrewrite,graphql): routes now handles disabled entities

app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/CatalogTreeDataProvider.php

@@ -63,11 +63,16 @@ public function getData(
         int $storeId = null
     ): array {
         $categoryId = (int)$id;
-        $categoriesTree = $this->categoryTree->getTreeCollection($info, $categoryId, $storeId);
-        if ($categoriesTree->count() == 0) {
+        $categoriesTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
+        if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
-        $result = current($this->extractDataFromCategoryTree->buildTree($categoriesTree, [$categoryId]));
+        $result = current($this->extractDataFromCategoryTree->execute($categoriesTree));
+
+        if ($result['model']->getIsActive() != '1') {
+            throw new GraphQlNoSuchEntityException(__('Category is disabled.'));
+        }
+
         $result['type_id'] = $entity_type;
         return $result;
     }

app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/ProductDataProvider.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\CatalogUrlRewriteGraphQl\Model\DataProvider\UrlRewrite;
@@ -11,6 +13,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\UrlRewriteGraphQl\Model\DataProvider\EntityDataProviderInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
 
 class ProductDataProvider implements EntityDataProviderInterface
 {
@@ -47,7 +51,18 @@ public function getData(
     ): array {
         $product = $this->productRepository->getById($id, false, $storeId);
         $result = $product->getData();
+
+        if (
+            $product->getStatus() == Status::STATUS_DISABLED
+            || (
+                $product->getVisibility() != Visibility::VISIBILITY_IN_CATALOG &&
+                $product->getVisibility() != Visibility::VISIBILITY_BOTH
+            )
+        ) {
+            throw new NoSuchEntityException(__("Routed Product is disabled."));
+        }
+
         $result['model'] = $product;
         return $result;
     }
-}
+}

app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php

@@ -1,13 +1,17 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\UrlRewriteGraphQl\Model\Resolver;
 
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Query\Uid;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
@@ -58,15 +62,21 @@ public function resolve(
         );
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         if ($resultArray) {
-            $result = [];
-            if (isset($resultArray['type'])) {
+            try {
                 $result = $this->entityDataProviderComposite->getData(
                     $resultArray['type'],
                     (int)$resultArray['id'],
                     $info,
                     $storeId
                 );
+            } catch (NoSuchEntityException $th) {
+                // Disabled Entities are expected to throw a NoSuchEntityException.
+                return null;
+            } catch (GraphQlNoSuchEntityException $th) {
+                // Disabled Entities are expected to throw a NoSuchEntityException.
+                return null;
             }
+
             $result['redirect_code'] = $resultArray['redirect_code'];
             $result['relative_url'] = $resultArray['relative_url'];
             $result['type'] = $resultArray['type'];