ACP2E-2092: Minicart is not updating in stores with subdomains, even though the session is shared.

Author: Anna Bukatar

app/code/Magento/Customer/Test/Unit/ViewModel/CookieSettings.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\ViewModel;
+
+use PHPUnit\Framework\TestCase;
+
+class CookieSettings extends TestCase
+{
+    /**
+     * @var \Magento\Customer\ViewModel\CookieSettings
+     */
+    private $cookieSettings;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $scopeConfigMock;
+
+    protected function setUp(): void
+    {
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->cookieSettings = new \Magento\Customer\ViewModel\CookieSettings(
+            $this->scopeConfigMock
+        );
+    }
+
+    public function testGetCookieDomain()
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Customer\ViewModel\CookieSettings::XML_PATH_COOKIE_DOMAIN,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )
+            ->willReturn('example.com');
+
+        $this->assertEquals('example.com', $this->cookieSettings->getCookieDomain());
+    }
+}

app/code/Magento/Customer/ViewModel/CookieSettings.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\ViewModel;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+class CookieSettings implements ArgumentInterface
+{
+    public const XML_PATH_COOKIE_DOMAIN = 'web/cookie/cookie_domain';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Get cookie domain for a store view
+     *
+     * @return mixed
+     */
+    public function getCookieDomain()
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_COOKIE_DOMAIN,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+}

app/code/Magento/Customer/view/frontend/layout/default.xml

@@ -52,6 +52,7 @@
                 <arguments>
                     <argument name="auth" xsi:type="object">Magento\Customer\ViewModel\Customer\Auth</argument>
                     <argument name="json_serializer" xsi:type="object">Magento\Customer\ViewModel\Customer\JsonSerializer</argument>
+                    <argument name="cookie_settings" xsi:type="object">Magento\Customer\ViewModel\CookieSettings</argument>
                 </arguments>
             </block>
             <block name="customer.data.invalidation.rules" class="Magento\Customer\Block\CustomerScopeData"

app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml

@@ -5,6 +5,7 @@
  */
 use Magento\Customer\ViewModel\Customer\Data;
 use Magento\Framework\App\ObjectManager;
+use Magento\Customer\ViewModel\CookieSettings;
 
 /** @var \Magento\Customer\Block\CustomerData $block */
 
@@ -16,6 +17,8 @@ $jsonSerializer = $block->getJsonSerializer() ??
     ObjectManager::getInstance()->get(JsonSerializer::class);
 $customerDataUrl = $block->getCustomerDataUrl('customer/account/updateSession');
 $expirableSectionNames = $block->getExpirableSectionNames();
+/** @var CookieSettings $cookieSettings */
+$cookieSettings = $block->getCookieSettings();
 ?>
 <script type="text/x-magento-init">
     {
@@ -27,6 +30,7 @@ $expirableSectionNames = $block->getExpirableSectionNames();
                     $expirableSectionNames
                 ) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
+                "cookieDomain": "<?= $block->escapeJs($cookieSettings->getCookieDomain()) ?>",
                 "updateSessionUrl": "<?= $block->escapeJs($customerDataUrl) ?>",
                 "isLoggedIn": "<?= /* @noEscape */ $auth->isLoggedIn() ?>"
             }

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -232,6 +232,13 @@ define([
                 path: '/',
                 expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000)
             });
+
+            if (options.cookieDomain) {
+                $.cookieStorage.setConf({
+                    domain: options.cookieDomain
+                });
+            }
+
             storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
             storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
         },