From df3414ebafbb6f2ac1f377e6ac32cec7d2e86e18 Mon Sep 17 00:00:00 2001
From: AleksandrsKondratjevs <Aleksandrs.Kondratjevs@scandiweb.com>
Date: Tue, 8 Jun 2021 10:41:18 +0300
Subject: [PATCH] Return null in case if product not assigned to website

---
 src/Model/Resolver/EntityUrl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Model/Resolver/EntityUrl.php b/src/Model/Resolver/EntityUrl.php
index 0f885ff..0d963ac 100644
--- a/src/Model/Resolver/EntityUrl.php
+++ b/src/Model/Resolver/EntityUrl.php
@@ -112,7 +112,8 @@ public function resolve(
             if ($type === 'PRODUCT') {
                 // Using this instead of factory due https://github.com/magento/magento2/issues/12278
                 $collection = $this->productCollectionFactory->create()
-                    ->addAttributeToFilter('status', ['eq' => Status::STATUS_ENABLED]);
+                    ->addAttributeToFilter('status', ['eq' => Status::STATUS_ENABLED])
+                    ->addWebsiteFilter($this->storeManager->getWebsite());
                 $product = $collection->addIdFilter($id)->getFirstItem();
                 if (!$product->hasData()) {
                     return null;