Merge pull request #167 from magento/magento/magento2-login-as-customer#144

naydav · web-flow · commit 050d0d6d2038 · 2020-06-16T11:43:54.000-05:00
magento/magento2-login-as-customer#144: "Login as Customer" functionality should be enabled by default.
diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -45,7 +45,7 @@ public function __construct(
      */
     public function beforeLogout(Auth $subject): void
     {
-        if ($this->config->isEnabled()) {
+        if ($this->config->isEnabled() && $subject->getUser()) {
             $userId = (int)$subject->getUser()->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>0</enabled>
+                <enabled>1</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
`@@ -45,7 +45,7 @@ public function __construct(`
`45`	`45`	`*/`
`46`	`46`	`public function beforeLogout(Auth $subject): void`
`47`	`47`	`{`
`48`		`- if ($this->config->isEnabled()) {`
	`48`	`+ if ($this->config->isEnabled() && $subject->getUser()) {`
`49`	`49`	`$userId = (int)$subject->getUser()->getId();`
`50`	`50`	`$this->deleteAuthenticationDataForUser->execute($userId);`
`51`	`51`	`}`