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

@@ -45,8 +45,9 @@ public function __construct(
      */
     public function beforeLogout(Auth $subject): void
     {
-        if ($this->config->isEnabled() && $subject->getUser()) {
-            $userId = (int)$subject->getUser()->getId();
+        $user = $subject->getUser();
+        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
+            $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }
     }

app/code/Magento/LoginAsCustomer/etc/di.xml

@@ -13,4 +13,7 @@
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataForUser"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
     <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
+    <type name="Magento\Backend\Model\Auth">
+        <plugin name="login_as_customer_admin_logout" type="Magento\LoginAsCustomer\Plugin\AdminLogoutPlugin"/>
+    </type>
 </config>