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

 - Fixed the session clear issue.

Author: devarul

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

@@ -53,7 +53,11 @@ define([
             storage.removeAll();
         }
 
-        if (isLoggedIn === 0) {
+        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();
         }
 

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

@@ -6,6 +6,7 @@
 namespace Magento\PageCache\Model\App\FrontController;
 
 use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Customer\Model\Session;
 
 /**
  * Plugin for processing builtin cache
@@ -32,24 +33,40 @@ 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
+        \Magento\Framework\App\State $state,
+        ResponseHttp $responseHttp,
+        Session $session
     ) {
         $this->config = $config;
         $this->version = $version;
         $this->kernel = $kernel;
         $this->state = $state;
+        $this->responseHttp = $responseHttp;
+        $this->session = $session;
     }
 
     /**
@@ -66,6 +83,9 @@ 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);