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

Author: engcom-Foxtrot

app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php

@@ -8,6 +8,7 @@
 namespace Magento\LoginAsCustomer\Plugin;
 
 use Magento\Backend\Model\Auth;
+use Magento\Backend\Model\Auth\Session as AuthSession;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
 
@@ -16,6 +17,11 @@
  */
 class AdminLogoutPlugin
 {
+    /**
+     * @var AuthSession
+     */
+    private $authSession;
+
     /**
      * @var ConfigInterface
      */
@@ -27,13 +33,16 @@ class AdminLogoutPlugin
     private $deleteAuthenticationDataForUser;
 
     /**
+     * @param AuthSession $authSession
      * @param ConfigInterface $config
      * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
      */
     public function __construct(
+        AuthSession $authSession,
         ConfigInterface $config,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
     ) {
+        $this->authSession = $authSession;
         $this->config = $config;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
     }
@@ -46,7 +55,8 @@ public function __construct(
     public function beforeLogout(Auth $subject): void
     {
         $user = $subject->getUser();
-        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
+        $isLoggedAsCustomer = $this->authSession->getIsLoggedAsCustomer();
+        if ($this->config->isEnabled() && $user && $isLoggedAsCustomer) {
             $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }

app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php

@@ -167,6 +167,7 @@ public function execute(): ResultInterface
 
         $this->deleteAuthenticationDataForUser->execute($userId);
         $secret = $this->saveAuthenticationData->execute($authenticationData);
+        $this->authSession->setIsLoggedAsCustomer(true);
 
         $redirectUrl = $this->getLoginProceedRedirectUrl($secret, $storeId);
         $resultRedirect->setUrl($redirectUrl);