Mark whether login is by an admin

hungersoft · Dec 3, 2019 · 4a83757 · 4a83757
1 parent a58beed
commit 4a83757
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Controller/Login/Index.php b/Controller/Login/Index.php
@@ -97,6 +97,7 @@ public function execute()
 
         $this->customerSession->loginById($customerId);
         $this->customerSession->regenerateId();
+        $this->customerSession->setIsAdminLogin(true);
         $this->loginAsCustomerSession->setCustomerId(null);
 
         return $resultRedirect->setPath('customer/account');

diff --git a/Plugin/Frontend/Magento/PageCache/Model/Config.php b/Plugin/Frontend/Magento/PageCache/Model/Config.php
@@ -55,8 +55,6 @@ public function __construct(LoginAsCustomerHelper $helper, CustomerSession $cust
      */
     public function afterIsEnabled(PageCacheConfig $subject, $result)
     {
-        return $result
-            && $this->customerSession->getAdminLoginCustomerId()
-            && !$this->helper->isDisabledPageCacheForAdmin();
+        return $result || ($this->customerSession->getIsAdminLogin() && !$this->helper->isDisabledPageCacheForAdmin());
     }
 }