ACP2E-1445: Customer data in Local Storage not reset when session file lost

 - Fixed the issue.

Author: devarul

app/code/Magento/Customer/Model/Cart/RemoveCookiesWhenQuoteIsNullPlugin.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\ViewModel\Customer;
+
+use Magento\Customer\Model\Context;
+use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\Serialize\Serializer\Json as Json;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Customer's data view model
+ */
+class Data implements ArgumentInterface
+{
+    /**
+     * @var Json
+     */
+    private $jsonEncoder;
+
+    /**
+     *
+     * @var HttpContext
+     */
+    private $httpContext;
+
+    /**
+     * @param HttpContext $httpContext
+     * @param Json $jsonEncoder
+     */
+    public function __construct(
+        HttpContext $httpContext,
+        Json $jsonEncoder
+    ) {
+        $this->httpContext = $httpContext;
+        $this->jsonEncoder = $jsonEncoder;
+    }
+
+    /**
+     * Check is user login
+     *
+     * @return bool
+     */
+    public function isLoggedIn()
+    {
+        return $this->httpContext->getValue(Context::CONTEXT_AUTH);
+    }
+
+    /**
+     * Encode the mixed $valueToEncode into the JSON format
+     *
+     * @param mixed $valueToEncode
+     * @return string
+     */
+    public function jsonEncode($valueToEncode)
+    {
+        return $this->jsonEncoder->serialize($valueToEncode);
+    }
+}

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

@@ -57,9 +57,6 @@
     <type name="Magento\Checkout\Block\Cart\Sidebar">
         <plugin name="customer_cart" type="Magento\Customer\Model\Cart\ConfigPlugin" />
     </type>
-    <type name="Magento\Checkout\Block\Cart\Sidebar">
-        <plugin name="customer_remove_items_from_cart" type="Magento\Customer\Model\Cart\RemoveCookiesWhenQuoteIsNullPlugin" />
-    </type>
     <type name="Magento\Framework\Session\SessionManagerInterface">
         <plugin name="session_checker" type="Magento\Customer\CustomerData\Plugin\SessionChecker" />
     </type>

app/code/Magento/Customer/etc/frontend/di.xml

@@ -48,7 +48,11 @@
                 </arguments>
             </block>
             <block name="customer.customer.data"  class="Magento\Customer\Block\CustomerData"
-                   template="Magento_Customer::js/customer-data.phtml"/>
+                   template="Magento_Customer::js/customer-data.phtml">
+                <arguments>
+                    <argument name="view_model" xsi:type="object">Magento\Customer\ViewModel\Customer\Data</argument>
+                </arguments>
+            </block>
             <block name="customer.data.invalidation.rules" class="Magento\Customer\Block\CustomerScopeData"
                    template="Magento_Customer::js/customer-data/invalidation-rules.phtml"/>
         </referenceContainer>

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

@@ -3,23 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\Customer\ViewModel\Customer\Data;
+use Magento\Framework\App\ObjectManager;
 
 /** @var \Magento\Customer\Block\CustomerData $block */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
+/** @var Data $viewModel */
+$viewModel = $block->getViewModel() ?? ObjectManager::getInstance()->get(Data::class);
+$customerDataUrl = $block->getCustomerDataUrl('customer/account/updateSession');
+$expirableSectionNames = $block->getExpirableSectionNames();
 ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Customer/js/customer-data": {
                 "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
-                "expirableSectionNames": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)
-                    ->jsonEncode($block->getExpirableSectionNames()) ?>,
+                "expirableSectionNames": <?= /* @noEscape */ $viewModel->jsonEncode($expirableSectionNames) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
-                "updateSessionUrl": "<?= $block->escapeJs(
-                    $block->getCustomerDataUrl('customer/account/updateSession')
-                ) ?>"
+                "updateSessionUrl": "<?= $block->escapeJs($customerDataUrl) ?>",
+                "isLoggedIn": "<?= /* @noEscape */ $viewModel->isLoggedIn() ?>"
             }
         }
     }

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

@@ -47,10 +47,20 @@ define([
      * Invalidate Cache By Close Cookie Session
      */
     invalidateCacheByCloseCookieSession = function () {
+        var isLoggedIn = parseInt(options.isLoggedIn, 10) || 0;
+
         if (!$.cookieStorage.isSet('mage-cache-sessid')) {
             storage.removeAll();
         }
 
+        if (!$.localStorage.isSet('mage-customer-login')) {
+            $.localStorage.set('mage-customer-login', isLoggedIn);
+        }
+        if ($.localStorage.get('mage-customer-login') !== isLoggedIn) {
+            $.localStorage.set('mage-customer-login', isLoggedIn);
+            storage.removeAll();
+        }
+
         $.cookieStorage.set('mage-cache-sessid', true);
     };