magento/magento2-login-as-customer#144: Banner is not shown on Category page if Disable Page Cache For Admin User = No - updated.

Author: engcom-Foxtrot

app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php

@@ -8,6 +8,7 @@
 namespace Magento\LoginAsCustomer\Model;
 
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface;
 use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
@@ -43,11 +44,11 @@ class AuthenticateCustomerBySecret implements AuthenticateCustomerBySecretInterf
     public function __construct(
         GetAuthenticationDataBySecretInterface $getAuthenticationDataBySecret,
         Session $customerSession,
-        SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId
+        ?SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId = null
     ) {
         $this->getAuthenticationDataBySecret = $getAuthenticationDataBySecret;
         $this->customerSession = $customerSession;
-        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId;
+        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**

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

@@ -12,6 +12,7 @@
 use Magento\Backend\Model\Auth\Session;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
@@ -110,7 +111,7 @@ public function __construct(
         SaveAuthenticationDataInterface $saveAuthenticationData,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
         Url $url,
-        SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId
+        ?SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId = null
     ) {
         parent::__construct($context);
 
@@ -122,7 +123,7 @@ public function __construct(
         $this->saveAuthenticationData = $saveAuthenticationData;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
-        $this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId;
+        $this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerCustomerIdInterface::class);
     }
 
     /**

app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php

@@ -9,8 +9,6 @@
 
 /**
  * Get id of Admin logged as Customer.
- *
- * @api
  */
 interface GetLoggedAsCustomerAdminIdInterface
 {

app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php

@@ -9,8 +9,6 @@
 
 /**
  * Get id of Customer Admin is logged as.
- *
- * @api
  */
 interface GetLoggedAsCustomerCustomerIdInterface
 {

app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php

@@ -9,8 +9,6 @@
 
 /**
  * Set id of Admin logged as Customer.
- *
- * @api
  */
 interface SetLoggedAsCustomerAdminIdInterface
 {

app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php

@@ -9,8 +9,6 @@
 
 /**
  * Set id of Customer Admin is logged as.
- *
- * @api
  */
 interface SetLoggedAsCustomerCustomerIdInterface
 {

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

@@ -9,6 +9,7 @@
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -43,11 +44,11 @@ class LoginAsCustomerUi implements SectionSourceInterface
     public function __construct(
         Session $customerSession,
         StoreManagerInterface $storeManager,
-        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
+        ?GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId = null
     ) {
         $this->customerSession = $customerSession;
         $this->storeManager = $storeManager;
-        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**

app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\LoginAsCustomerFrontendUi\Plugin;
 
 use Magento\Framework\Session\SessionManagerInterface;

app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php

@@ -9,6 +9,7 @@
 
 use Magento\Customer\Model\Context;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\ObjectManager;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 
@@ -40,11 +41,11 @@ class Configuration implements \Magento\Framework\View\Element\Block\ArgumentInt
     public function __construct(
         ConfigInterface $config,
         HttpContext $httpContext,
-        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
+        ?GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId = null
     ) {
         $this->config = $config;
         $this->httpContext = $httpContext;
-        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**