MC-42884: Login As customer feature causing Incorrect store to load

Author: dhorytskyi

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

@@ -13,7 +13,6 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Customer\Model\Config\Share;
-use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Json as JsonResult;
 use Magento\Framework\Controller\ResultFactory;
@@ -247,9 +246,9 @@ private function getLoginProceedRedirectUrl(string $secret, int $storeId): strin
             ->setScope($targetStore)
             ->getUrl('loginascustomer/login/index', ['_query' => $queryParameters, '_nosid' => true]);
 
-        if (!$targetStore->isUseStoreInUrl()) {
-            $fromStore = $this->storeManager->getStore();
-            $redirectUrl = $this->manageStoreCookie->switch($fromStore, $targetStore, $redirectUrl);
+        $defaultStore = $this->storeManager->getDefaultStoreView();
+        if ($targetStore->getBaseUrl() === $defaultStore->getBaseUrl()) {
+            $redirectUrl = $this->manageStoreCookie->switch($defaultStore, $targetStore, $redirectUrl);
         }
 
         return $redirectUrl;