ACP2E-778: REST API: Product names in cart always use default store view values

Author: pradeep1819

app/code/Magento/Quote/Model/Quote/Plugin/UpdateQuoteStoreId.php

@@ -7,10 +7,10 @@
 
 namespace Magento\Quote\Model\Quote\Plugin;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote;
-use Magento\Store\Model\StoreCodeInRequestPathInterface;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Webapi\Request;
 
 /**
  * Updates quote store id.
@@ -23,61 +23,76 @@ class UpdateQuoteStoreId
     private $storeManager;
 
     /**
-     * @var StoreCodeInRequestPathInterface
+     * @var Request
      */
-    private $storeCodeInRequestPath;
+    private $request;
 
     /**
      * @param StoreManagerInterface $storeManager
-     * @param StoreCodeInRequestPathInterface $storeCodeInRequestPath
+     * @param Request $request
      */
     public function __construct(
         StoreManagerInterface $storeManager,
-        StoreCodeInRequestPathInterface $storeCodeInRequestPath
+        Request $request
     ) {
         $this->storeManager = $storeManager;
-        $this->storeCodeInRequestPath = $storeCodeInRequestPath;
+        $this->request = $request;
+    }
+
+    /**
+     * Returns store based on web-api request path.
+     *
+     * @param string $requestPath
+     * @return StoreInterface|null
+     */
+    private function getStore(string $requestPath): ?StoreInterface
+    {
+        $pathParts = explode('/', trim($requestPath, '/'));
+        $storeCode = current($pathParts);
+        $stores = $this->storeManager->getStores(false, true);
+
+        return $stores[$storeCode] ?? null;
     }
 
     /**
      * Update store id in requested quote by store id from request.
      *
+     * @param $quote
+     * @return Quote
+     */
+    private function loadQuote($quote): Quote
+    {
+        $store = $this->getStore($this->request->getPathInfo());
+        if ($store) {
+            $quote->setStoreId($store->getId());
+        }
+
+        return $quote;
+    }
+
+    /**
+     * Update store id in requested quote by store id from guest's request.
+     *
      * @param Quote $subject
      * @param Quote $result
      * @return Quote
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @throws NoSuchEntityException
      */
     public function afterLoadByIdWithoutStore(Quote $subject, Quote $result): Quote
     {
-        if ($this->storeCodeInRequestPath->hasStoreCodeInRequestPath()) {
-            $storeId = $this->storeManager->getStore()->getId();
-            if ((int)$storeId !== $result->getStoreId()) {
-                $result->setStoreId($storeId);
-            }
-        }
-
-        return $result;
+        return $this->loadQuote($result);
     }
 
     /**
-     * Update store id in requested quote by store id from request for registered customer.
+     * Update store id in requested quote by store id from registered customer's request.
      *
      * @param Quote $subject
      * @param Quote $result
      * @return Quote
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @throws NoSuchEntityException
      */
     public function afterLoadByCustomer(Quote $subject, Quote $result): Quote
     {
-        if ($this->storeCodeInRequestPath->hasStoreCodeInRequestPath()) {
-            $storeId = $this->storeManager->getStore()->getId();
-            if ((int)$storeId !== $result->getStoreId()) {
-                $result->setStoreId($storeId);
-            }
-        }
-
-        return $result;
+        return $this->loadQuote($result);
     }
 }

app/code/Magento/Quote/etc/webapi_rest/di.xml

@@ -19,5 +19,4 @@
     <type name="Magento\Quote\Model\Quote">
         <plugin name="updateQuoteStoreId" type="Magento\Quote\Model\Quote\Plugin\UpdateQuoteStoreId" />
     </type>
-    <preference for="Magento\Store\Model\StoreCodeInRequestPathInterface" type="Magento\Store\Model\StoreCodeInRequestPath" />
 </config>

app/code/Magento/Quote/etc/webapi_soap/di.xml

@@ -16,5 +16,4 @@
     <type name="Magento\Quote\Model\Quote">
         <plugin name="updateQuoteStoreId" type="Magento\Quote\Model\Quote\Plugin\UpdateQuoteStoreId" />
     </type>
-    <preference for="Magento\Store\Model\StoreCodeInRequestPathInterface" type="Magento\Store\Model\StoreCodeInRequestPath" />
 </config>

app/code/Magento/Store/Model/StoreCodeInRequestPath.php

@@ -8,49 +8,36 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Locale\ResolverInterface;
-use Magento\Store\Model\StoreCodeInRequestPathInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class PathProcessor to resolve the request path
  */
 class PathProcessor
 {
     /**  Store code alias to indicate that all stores should be affected by action */
-    public const ALL_STORE_CODE = 'all';
+    const ALL_STORE_CODE = 'all';
 
     /**
-     * @var StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
     /**
-     * @var ResolverInterface
+     * @var \Magento\Framework\Locale\ResolverInterface
      */
     private $localeResolver;
 
     /**
-     * @var StoreCodeInRequestPathInterface
-     */
-    private $storeCodeInRequestPath;
-
-    /**
-     * @param StoreManagerInterface $storeManager
-     * @param ResolverInterface|null $localeResolver
-     * @param StoreCodeInRequestPathInterface|null $storeCodeInRequestPath
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      */
     public function __construct(
-        StoreManagerInterface $storeManager,
-        ResolverInterface $localeResolver = null,
-        ?StoreCodeInRequestPathInterface $storeCodeInRequestPath = null
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Locale\ResolverInterface $localeResolver = null
     ) {
         $this->storeManager = $storeManager;
         $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(
-            ResolverInterface::class
-        );
-        $this->storeCodeInRequestPath = $storeCodeInRequestPath ?: ObjectManager::getInstance()->get(
-            StoreCodeInRequestPathInterface::class
+            \Magento\Framework\Locale\ResolverInterface::class
         );
     }
 
@@ -81,7 +68,6 @@ public function process($pathInfo)
         $storeCode = current($pathParts);
         $stores = $this->storeManager->getStores(false, true);
         if (isset($stores[$storeCode])) {
-            $this->storeCodeInRequestPath->setStoreCodeInRequestPath(true);
             $this->storeManager->setCurrentStore($storeCode);
             $this->localeResolver->emulate($this->storeManager->getStore()->getId());
             $path = '/' . ($pathParts[1] ?? '');

app/code/Magento/Store/Model/StoreCodeInRequestPathInterface.php

@@ -66,5 +66,4 @@
             <argument name="fileName" xsi:type="string">webapi.xml</argument>
         </arguments>
     </type>
-    <preference for="Magento\Store\Model\StoreCodeInRequestPathInterface" type="Magento\Store\Model\StoreCodeInRequestPath" />
 </config>

app/code/Magento/Webapi/Controller/PathProcessor.php

@@ -8,6 +8,7 @@
 namespace Magento\Quote\Api;
 
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;
@@ -316,14 +317,14 @@ private function getServiceInfoAddToCart(string $token): array
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple_multistore.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      *
-     * @param string $storeCode
      * @param string $expectedProductName
+     * @param string|null $storeCode
      *
      * @return void
      * @dataProvider dataProviderForMultiStoreView
-     * @throws \Magento\Framework\Exception\AuthenticationException
+     * @throws AuthenticationException
      */
-    public function testForProductNameAsPerStoreView(string $storeCode, string $expectedProductName): void
+    public function testForProductNameAsPerStoreView(string $expectedProductName, ?string $storeCode = null): void
     {
         $this->_markTestAsRestOnly();
 
@@ -366,13 +367,9 @@ public function testForProductNameAsPerStoreView(string $storeCode, string $expe
         ];
         /** @var \Magento\Quote\Api\Data\CartInterface $cart */
         $cart = $this->_webApiCall($serviceInfo, [], null, $storeCode);
-
-        $actualProductName = '';
         $carts = $cart['items'];
-        foreach ($carts as $item) {
-            $actualProductName = $item['name'];
-            break;
-        }
+        $actualProductName = $carts[0]['name'] ?? '';
+
         $this->assertEquals($expectedProductName, $actualProductName);
     }
 
@@ -382,14 +379,18 @@ public function testForProductNameAsPerStoreView(string $storeCode, string $expe
     public function dataProviderForMultiStoreView(): array
     {
         return [
-            'defaultStoreView' => [
-                'default',
-                'Simple Product One'
+            'noStoreCodeInRequestPath' => [
+                'Simple Product One',
+                null
             ],
-            'secondStoreView' => [
-                'fixturestore',
-                'StoreTitle'
+            'defaultStoreCodeInRequestPath' => [
+                'Simple Product One',
+                'default'
             ],
+            'secondStoreCodeInRequestPath' => [
+                'StoreTitle',
+                'fixturestore'
+            ]
         ];
     }
 }