Merge pull request #167 from magento/magento/magento2-login-as-custom…

…er#144 magento/magento2-login-as-customer#144: "Login as Customer" functionality should be enabled by default.
magento · Jun 16, 2020 · 050d0d6 · 050d0d6
2 parents a86d2d6 + 62d0a29
commit 050d0d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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>