magento2-login-as-customer/issues/104: Global refactoring

- Builds fixes

Author: naydav

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

@@ -15,10 +15,6 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="secret"/>
         </constraint>
-        <index referenceId="LOGIN_AS_CUSTOMER_SECRET_CREATED_AT" indexType="btree">
-            <column name="secret"/>
-            <column name="created_at"/>
-        </index>
         <index referenceId="LOGIN_AS_CUSTOMER_CREATED_AT" indexType="btree">
             <column name="created_at"/>
         </index>

app/code/Magento/LoginAsCustomer/etc/db_schema_whitelist.json

@@ -7,7 +7,6 @@
             "created_at": true
         },
         "index": {
-            "LOGIN_AS_CUSTOMER_SECRET_CREATED_AT": true,
             "LOGIN_AS_CUSTOMER_CREATED_AT": true
         },
         "constraint": {

app/code/Magento/LoginAsCustomerApi/Api/Data/AuthenticationDataInterface.php

@@ -31,7 +31,9 @@ public function getCustomerId(): int;
     public function getAdminId(): int;
 
     /**
-     * @inheritdoc
+     * Get extension attributes
+     *
+     * @return AuthenticationDataExtensionInterface|null
      */
     public function getExtensionAttributes(): ?AuthenticationDataExtensionInterface;
 }

app/code/Magento/LoginAsCustomerLog/composer.json

@@ -12,6 +12,9 @@
         "magento/module-ui": "*",
         "magento/module-user": "*"
     },
+    "suggest": {
+        "magento/module-login-as-customer": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",

app/code/Magento/LoginAsCustomerSales/Plugin/AdminAddCommentOnOrderPlacementPlugin.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomer\Plugin;
+namespace Magento\LoginAsCustomerSales\Plugin;
 
 use Magento\Backend\Model\Auth\Session;
 use Magento\Sales\Model\Order;

app/code/Magento/LoginAsCustomerSales/Plugin/AuthenticateCustomer.php renamed to app/code/Magento/LoginAsCustomerSales/Plugin/AuthenticateCustomerPlugin.php

@@ -17,7 +17,7 @@
 /**
  * Class AuthenticateCustomer Plugin
  */
-class AuthenticateCustomer
+class AuthenticateCustomerPlugin
 {
     /**
      * @var CustomerSession

app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomer\Plugin;
+namespace Magento\LoginAsCustomerSales\Plugin;
 
 use Magento\Customer\Model\Session;
 use Magento\Sales\Model\Order;

app/code/Magento/LoginAsCustomerSales/composer.json

@@ -3,9 +3,17 @@
     "description": "",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
         "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-quote": "*",
         "magento/module-login-as-customer": "*",
-        "magento/module-quote": "*"
+        "magento/module-user": "*"
+    },
+    "suggest": {
+        "magento/sales": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "type": "magento2-module",
     "license": [

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

@@ -9,6 +9,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerInterface">
         <plugin name="login_as_customer_sales_authenticate_customer"
-                type="Magento\LoginAsCustomerSales\Plugin\AuthenticateCustomer"/>
+                type="Magento\LoginAsCustomerSales\Plugin\AuthenticateCustomerPlugin"/>
     </type>
 </config>

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

@@ -9,7 +9,7 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\RequestInterface;
+use Magento\Backend\Model\Auth\Session;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
@@ -18,11 +18,11 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Message\ManagerInterface;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
-use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterfaceFactor;
+use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Login as customer action
@@ -40,35 +40,15 @@ class Login extends Action implements HttpGetActionInterface, HttpPostActionInte
     const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login';
 
     /**
-     * @var ResultFactory
-     */
-    private $resultFactory;
-
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @var ManagerInterface
-     */
-    private $messageManager;
-
-    /**
-     * @var \Magento\Backend\Model\Auth\Session
+     * @var Session
      */
     private $authSession;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     private $storeManager;
 
-    /**
-     * @var \Magento\Framework\Url
-     */
-    private $url;
-
     /**
      * @var CustomerRepositoryInterface
      */
@@ -91,38 +71,26 @@ class Login extends Action implements HttpGetActionInterface, HttpPostActionInte
 
     /**
      * @param Context $context
-     * @param ResultFactory $resultFactory
-     * @param RequestInterface $request
-     * @param ManagerInterface $messageManager
-     * @param \Magento\Backend\Model\Auth\Session $authSession
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Url $url
+     * @param Session $authSession
+     * @param StoreManagerInterface $storeManager
      * @param CustomerRepositoryInterface $customerRepository
      * @param ConfigInterface $config
      * @param AuthenticationDataInterfaceFactory $authenticationDataFactory
      * @param SaveAuthenticationDataInterface $saveAuthenticationData
      */
     public function __construct(
         Context $context,
-        ResultFactory $resultFactory,
-        RequestInterface $request,
-        ManagerInterface $messageManager,
-        \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Url $url,
+        Session $authSession,
+        StoreManagerInterface $storeManager,
         CustomerRepositoryInterface $customerRepository,
         ConfigInterface $config,
         AuthenticationDataInterfaceFactory $authenticationDataFactory,
         SaveAuthenticationDataInterface $saveAuthenticationData
     ) {
         parent::__construct($context);
 
-        $this->resultFactory = $resultFactory;
-        $this->request = $request;
-        $this->messageManager = $messageManager;
         $this->authSession = $authSession;
         $this->storeManager = $storeManager;
-        $this->url = $url;
         $this->customerRepository = $customerRepository;
         $this->config = $config;
         $this->authenticationDataFactory = $authenticationDataFactory;
@@ -146,9 +114,9 @@ public function execute(): ResultInterface
             return $resultRedirect->setPath('customer/index/index');
         }
 
-        $customerId = (int)$this->request->getParam('customer_id');
+        $customerId = (int)$this->_request->getParam('customer_id');
         if (!$customerId) {
-            $customerId = (int)$this->request->getParam('entity_id');
+            $customerId = (int)$this->_request->getParam('entity_id');
         }
 
         try {
@@ -158,7 +126,7 @@ public function execute(): ResultInterface
             return $resultRedirect->setPath('customer/index/index');
         }
 
-        $storeId = $this->request->getParam('store_id');
+        $storeId = $this->_request->getParam('store_id');
         if (empty($storeId) && $this->config->isStoreManualChoiceEnabled()) {
             $this->messageManager->addNoticeMessage(__('Please select a Store View to login in.'));
             return $resultRedirect->setPath('loginascustomer/login/manual', ['customer_id' => $customerId]);
@@ -195,7 +163,7 @@ private function getLoginProceedRedirectUrl(string $secret, ?int $storeId): stri
             $store = $this->storeManager->getStore($storeId);
         }
 
-        $redirectUrl = $this->url
+        $redirectUrl = $this->_url
             ->setScope($store)
             ->getUrl('loginascustomer/login/index', ['secret' => $secret, '_nosid' => true]);
         return $redirectUrl;