Merge remote-tracking branch 'origin/magento/magento2-login-as-customer#186' into login-as-customer-prs

naydav · naydav · commit 2e517ef18df9 · 2020-08-04T12:29:20.000-05:00
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
@@ -61,7 +61,9 @@ public function beforeExecute(ActionInterface $subject)
             $customerId = (int)$this->session->getCustomerId();
             if ($adminId && $customerId) {
                 if (!$this->isLoginAsCustomerSessionActive->execute($customerId, $adminId)) {
-                    $this->session->destroy();
+                    $this->session->clearStorage();
+                    $this->session->expireSessionCookie();
+                    $this->session->regenerateId();
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ public function beforeExecute(ActionInterface $subject)`
`61`	`61`	`$customerId = (int)$this->session->getCustomerId();`
`62`	`62`	`if ($adminId && $customerId) {`
`63`	`63`	`if (!$this->isLoginAsCustomerSessionActive->execute($customerId, $adminId)) {`
`64`		`- $this->session->destroy();`
	`64`	`+ $this->session->clearStorage();`
	`65`	`+ $this->session->expireSessionCookie();`
	`66`	`+ $this->session->regenerateId();`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`	`}`