magento2/issues/29113 Customers should be able to enable/disable Admin "remote shopping assistance"

Author: naydav

app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php

@@ -7,7 +7,7 @@
 
 namespace Magento\LoginAsCustomer\Model\Resolver;
 
-use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
@@ -23,17 +23,17 @@ class IsLoginAsCustomerEnabledResolver implements IsLoginAsCustomerEnabledForCus
     private $config;
 
     /**
-     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
      */
     private $resultFactory;
 
     /**
      * @param ConfigInterface $config
-     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
      */
     public function __construct(
         ConfigInterface $config,
-        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+        IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
     ) {
         $this->config = $config;
         $this->resultFactory = $resultFactory;

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

@@ -23,9 +23,7 @@
     <preference for="Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\GetLoggedAsCustomerCustomerId"/>
     <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerAdminIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerAdminId"/>
     <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerCustomerId"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface"
-                type="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain"/>
-    <type name="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain">
+    <type name="Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerChain">
         <arguments>
             <argument name="resolvers" xsi:type="array">
                 <item name="is_enabled" xsi:type="object">

app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php renamed to app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomer\Model;
+namespace Magento\LoginAsCustomerApi\Model;
 
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
@@ -22,7 +22,7 @@ class IsLoginAsCustomerEnabledForCustomerChain implements IsLoginAsCustomerEnabl
     private $config;
 
     /**
-     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
      */
     private $resultFactory;
 
@@ -33,12 +33,12 @@ class IsLoginAsCustomerEnabledForCustomerChain implements IsLoginAsCustomerEnabl
 
     /**
      * @param ConfigInterface $config
-     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
      * @param array $resolvers
      */
     public function __construct(
         ConfigInterface $config,
-        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory,
+        IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory,
         array $resolvers = []
     ) {
         $this->config = $config;
@@ -52,7 +52,7 @@ public function __construct(
     public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface
     {
         $messages = [[]];
-        /** @var IsLoginAsCustomerEnabledForCustomerResultInterface $resolver */
+        /** @var IsLoginAsCustomerEnabledForCustomerInterface $resolver */
         foreach ($this->resolvers as $resolver) {
             $resolverResult = $resolver->execute($customerId);
             if (!$resolverResult->isEnabled()) {

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

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface"
+                type="Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerChain"/>
+</config>

app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php

@@ -7,7 +7,7 @@
 
 namespace Magento\LoginAsCustomerAssistance\Model\Processor;
 
-use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
 use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
@@ -23,17 +23,17 @@ class IsLoginAsCustomerAllowedResolver implements IsLoginAsCustomerEnabledForCus
     private $isAssistanceEnabled;
 
     /**
-     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
      */
     private $resultFactory;
 
     /**
      * @param IsAssistanceEnabledInterface $isAssistanceEnabled
-     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
      */
     public function __construct(
         IsAssistanceEnabledInterface $isAssistanceEnabled,
-        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+        IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
     ) {
         $this->isAssistanceEnabled = $isAssistanceEnabled;
         $this->resultFactory = $resultFactory;

app/code/Magento/LoginAsCustomerAssistance/composer.json

@@ -6,7 +6,6 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
-        "magento/module-login-as-customer": "*",
         "magento/module-login-as-customer-api": "*"
     },
     "suggest": {

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

@@ -13,7 +13,7 @@
                 type="Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled"/>
     <preference for="Magento\LoginAsCustomerAssistance\Api\SetAssistanceInterface"
                 type="Magento\LoginAsCustomerAssistance\Model\SetAssistance"/>
-    <type name="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain">
+    <type name="Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerChain">
         <arguments>
             <argument name="resolvers" xsi:type="array">
                 <item name="is_allowed" xsi:type="object">