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

 - Implemented the new solution approach.

Author: devarul

app/code/Magento/Customer/Model/App/FrontController/DeleteCookieWhenCustomerNotExistPlugin.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\App\FrontController;
+
+use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Customer\Model\Session;
+
+/**
+ * Plugin for delete the cookie when the customer is not exist.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class DeleteCookieWhenCustomerNotExistPlugin
+{
+    /**
+     * @var ResponseHttp
+     */
+    private $responseHttp;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * Constructor
+     *
+     * @param ResponseHttp $responseHttp
+     * @param Session $session
+     */
+    public function __construct(
+        ResponseHttp $responseHttp,
+        Session $session
+    ) {
+        $this->responseHttp = $responseHttp;
+        $this->session = $session;
+    }
+
+    /**
+     * Delete the cookie when the customer is not exist before dispatch the front controller.
+     *
+     * @return void
+     */
+    public function beforeDispatch(): void
+    {
+        if (!$this->session->getCustomerId()) {
+            $this->responseHttp->sendVary();
+        }
+    }
+}

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

@@ -127,4 +127,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="delete-cookie-when-customer-not-exist" type="Magento\Customer\Model\App\FrontController\DeleteCookieWhenCustomerNotExistPlugin"/>
+    </type>
 </config>

app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php

@@ -6,7 +6,6 @@
 namespace Magento\PageCache\Model\App\FrontController;
 
 use Magento\Framework\App\Response\Http as ResponseHttp;
-use Magento\Customer\Model\Session;
 
 /**
  * Plugin for processing builtin cache
@@ -33,40 +32,24 @@ class BuiltinPlugin
      */
     protected $state;
 
-    /**
-     * @var ResponseHttp
-     */
-    protected $responseHttp;
-
-    /**
-     * @var Session
-     */
-    private $session;
-
     /**
      * Constructor
      *
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\Framework\App\PageCache\Version $version
      * @param \Magento\Framework\App\PageCache\Kernel $kernel
      * @param \Magento\Framework\App\State $state
-     * @param ResponseHttp $responseHttp
-     * @param Session $session
      */
     public function __construct(
         \Magento\PageCache\Model\Config $config,
         \Magento\Framework\App\PageCache\Version $version,
         \Magento\Framework\App\PageCache\Kernel $kernel,
-        \Magento\Framework\App\State $state,
-        ResponseHttp $responseHttp,
-        Session $session
+        \Magento\Framework\App\State $state
     ) {
         $this->config = $config;
         $this->version = $version;
         $this->kernel = $kernel;
         $this->state = $state;
-        $this->responseHttp = $responseHttp;
-        $this->session = $session;
     }
 
     /**
@@ -83,9 +66,6 @@ public function aroundDispatch(
         \Closure $proceed,
         \Magento\Framework\App\RequestInterface $request
     ) {
-        if (!$this->session->getCustomerId()) {
-            $this->responseHttp->sendVary();
-        }
         $this->version->process();
         if (!$this->config->isEnabled() || $this->config->getType() !== \Magento\PageCache\Model\Config::BUILT_IN) {
             return $proceed($request);