Proposed code change to patch #34863

app/code/Magento/Theme/Controller/Result/MessagePlugin.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Translate\Inline\ParserInterface;
 use Magento\Framework\Translate\InlineInterface;
 use Magento\Framework\Session\Config\ConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Plugin for putting messages to cookies
@@ -59,6 +60,11 @@ class MessagePlugin
      */
     protected $sessionConfig;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
@@ -67,6 +73,7 @@ class MessagePlugin
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      * @param InlineInterface $inlineTranslate
      * @param ConfigInterface $sessionConfig
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -75,7 +82,8 @@ public function __construct(
         \Magento\Framework\View\Element\Message\InterpretationStrategyInterface $interpretationStrategy,
         \Magento\Framework\Serialize\Serializer\Json $serializer,
         InlineInterface $inlineTranslate,
-        ConfigInterface $sessionConfig
+        ConfigInterface $sessionConfig,
+        ScopeConfigInterface $scopeConfig
     ) {
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
@@ -84,6 +92,7 @@ public function __construct(
         $this->interpretationStrategy = $interpretationStrategy;
         $this->inlineTranslate = $inlineTranslate;
         $this->sessionConfig = $sessionConfig;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -171,11 +180,36 @@ private function setCookie(array $messages)
             }
 
             $publicCookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata();
-            $publicCookieMetadata->setDurationOneYear();
-            $publicCookieMetadata->setPath($this->sessionConfig->getCookiePath());
+
+            if( $configLifetime = $this->scopeConfig->getValue(
+                'web/cookie/cookie_lifetime',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ) ) {
+                $publicCookieMetadata->setDuration($configLifetime);
+            } else {
+                $publicCookieMetadata->setDurationOneYear();
+            }
+
+            if( $configPath = $this->scopeConfig->getValue(
+                'web/cookie/cookie_path',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ) ) {
+                $publicCookieMetadata->setPath($configPath);
+            } else {
+                 $publicCookieMetadata->setPath($this->sessionConfig->getCookiePath());
+            }
+
             $publicCookieMetadata->setHttpOnly(false);
+
             $publicCookieMetadata->setSameSite('Strict');
 
+            if( $configDomain = $this->scopeConfig->getValue(
+                'web/cookie/cookie_domain',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ) ) {
+                $publicCookieMetadata->setDomain($configDomain);
+            }
+
             $this->cookieManager->setPublicCookie(
                 self::MESSAGES_COOKIES_NAME,
                 $this->serializer->serialize($messages),

app/code/Magento/Theme/Helper/Config.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Magento\Theme\Helper;
+
+class Config extends \Magento\Framework\App\Helper\AbstractHelper
+{
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $_storeManager;
+
+    /**
+     * @param \Magento\Framework\App\Helper\Context      $context
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        \Magento\Framework\App\Helper\Context $context,
+        \Magento\Store\Model\StoreManagerInterface $storeManager
+    ) {
+        parent::__construct($context);
+        $this->_storeManager = $storeManager;
+    }
+
+    /**
+     * @param  string $path
+     * @param  null|int $store
+     * @return null|string
+     */
+    public function getConfig($path, $store = null)
+    {
+        $store  = $this->_storeManager->getStore($store);
+        $result = $this->scopeConfig->getValue(
+            $path,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
+        return $result;
+    }
+
+}

app/code/Magento/Theme/view/frontend/templates/messages.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
+<?php $helperConfig = $this->helper('Magento\Theme\Helper\Config'); ?>
 <div data-bind="scope: 'messages'">
     <!-- ko if: cookieMessages && cookieMessages.length > 0 -->
     <div aria-atomic="true" role="alert" data-bind="foreach: { data: cookieMessages, as: 'message' }" class="messages">
@@ -35,7 +36,8 @@
             "Magento_Ui/js/core/app": {
                 "components": {
                         "messages": {
-                            "component": "Magento_Theme/js/view/messages"
+                            "component": "Magento_Theme/js/view/messages",
+                            "cookieDomain": "<?= $helperConfig->getConfig( 'web/cookie/cookie_domain' ) ?>"
                         }
                     }
                 }

app/code/Magento/Theme/view/frontend/web/js/view/messages.js

@@ -41,7 +41,7 @@ define([
 
             $.mage.cookies.set('mage-messages', '', {
                 samesite: 'strict',
-                domain: ''
+                domain: this.cookieDomain
             });
         },