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

Author: naydav

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) {
+        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
             $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }

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>

app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php

@@ -49,7 +49,7 @@ public function __construct(
      */
     public function getSectionData(): array
     {
-        if (!$this->customerSession->getCustomerId()) {
+        if (!$this->customerSession->getCustomerId() || !$this->customerSession->getLoggedAsCustomerAdmindId()) {
             return [];
         }