magento-commerce/magento2-login-as-customer#171: Force customer unlogin during admin loglout without additional MySQL queries

naydav · naydav · commit 76c4198b9060 · 2020-06-16T23:46:46.000-05:00
diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -46,7 +46,7 @@ public function __construct(
     public function beforeLogout(Auth $subject): void
     {
         $user = $subject->getUser();
-        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
+        if ($this->config->isEnabled() && $user) {
             $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }
diff --git a/app/code/Magento/LoginAsCustomer/etc/config.xml b/app/code/Magento/LoginAsCustomer/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <login_as_customer>
             <general>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <store_view_manual_choice_enabled>0</store_view_manual_choice_enabled>
                 <authentication_data_expiration_time>60</authentication_data_expiration_time>
             </general>

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function __construct(`
`46`	`46`	`public function beforeLogout(Auth $subject): void`
`47`	`47`	`{`
`48`	`48`	`$user = $subject->getUser();`
`49`		`- if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {`
	`49`	`+ if ($this->config->isEnabled() && $user) {`
`50`	`50`	`$userId = (int)$user->getId();`
`51`	`51`	`$this->deleteAuthenticationDataForUser->execute($userId);`
`52`	`52`	`}`