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

- Magento\LoginAsCustomer\Api\AuthenticateCustomerInterface refactoring

Author: naydav

app/code/Magento/LoginAsCustomer/Api/AuthenticateCustomerInterface.php

@@ -7,17 +7,22 @@
 
 namespace Magento\LoginAsCustomer\Api;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\LoginAsCustomer\Api\Data\AuthenticationDataInterface;
+
 /**
+ * Authenticate a customer
+ *
  * @api
  */
 interface AuthenticateCustomerInterface
 {
     /**
-     * Authenticate a customer by customer ID
+     * Authenticate a customer
      *
-     * @return bool
-     * @param int $customerId
-     * @param int $adminId
+     * @param AuthenticationDataInterface $authenticationData
+     * @return void
+     * @throws LocalizedException
      */
-    public function execute(int $customerId, int $adminId):bool;
+    public function execute(AuthenticationDataInterface $authenticationData): void;
 }

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

@@ -8,10 +8,12 @@
 namespace Magento\LoginAsCustomer\Model;
 
 use Magento\Customer\Model\Session;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\LoginAsCustomer\Api\AuthenticateCustomerInterface;
+use Magento\LoginAsCustomer\Api\Data\AuthenticationDataInterface;
 
 /**
- * @api
+ * @inheritdoc
  */
 class AuthenticateCustomer implements AuthenticateCustomerInterface
 {
@@ -21,7 +23,6 @@ class AuthenticateCustomer implements AuthenticateCustomerInterface
     private $customerSession;
 
     /**
-     * AuthenticateCustomer constructor.
      * @param Session $customerSession
      */
     public function __construct(
@@ -31,25 +32,20 @@ public function __construct(
     }
 
     /**
-     * Authenticate a customer by customer ID
-     *
-     * @return bool
-     * @param int $customerId
-     * @param int $adminId
+     * @inheritdoc
      */
-    public function execute(int $customerId, int $adminId):bool
+    public function execute(AuthenticationDataInterface $authenticationData): void
     {
         if ($this->customerSession->getId()) {
-            /* Logout if logged in */
             $this->customerSession->logout();
         }
 
-        $loggedIn = $this->customerSession->loginById($customerId);
-        if ($loggedIn) {
-            $this->customerSession->regenerateId();
-            $this->customerSession->setLoggedAsCustomerAdmindId($adminId);
+        $loggedIn = $this->customerSession->loginById($authenticationData->getCustomerId());
+        if (!$loggedIn) {
+            throw new LocalizedException(__('Login was not successful.'));
         }
 
-        return $loggedIn;
+        $this->customerSession->regenerateId();
+        $this->customerSession->setLoggedAsCustomerAdmindId($authenticationData->getAdminId());
     }
 }

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

@@ -9,6 +9,8 @@
 
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\LoginAsCustomer\Api\Data\AuthenticationDataInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\LoginAsCustomer\Api\AuthenticateCustomerInterface;
 
@@ -51,54 +53,44 @@ public function __construct(
      * Remove all items from guest shopping cart
      *
      * @param AuthenticateCustomerInterface $subject
-     * @param int $customerId
-     * @param int $adminId
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @param AuthenticationDataInterface $authenticationData
+     * @return null
+     * @throws LocalizedException
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeExecute(
         AuthenticateCustomerInterface $subject,
-        int $customerId,
-        int $adminId
+        AuthenticationDataInterface $authenticationData
     ) {
         if (!$this->customerSession->getId()) {
             $quote = $this->checkoutSession->getQuote();
             /* Remove items from guest cart */
-            foreach ($quote->getAllVisibleItems() as $item) {
-                $quote->removeItem($item->getId());
-            }
-            $this->quoteRepository->save($quote);
+            $quote->removeAllItems();
         }
+        return null;
     }
 
     /**
-     * Mark customer cart as not guest
+     * Mark customer cart as not-guest
      *
-     * @param int $adminId
      * @param AuthenticateCustomerInterface $subject
-     * @param bool $result
-     * @param int $customerId
-     * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @param null $result
+     * @param AuthenticationDataInterface $authenticationData
+     * @return void
+     * @throws LocalizedException
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterExecute(
         AuthenticateCustomerInterface $subject,
-        bool $result,
-        int $customerId,
-        int $adminId
+        $result,
+        AuthenticationDataInterface $authenticationData
     ) {
-        if ($result) {
-            $this->checkoutSession->loadCustomerQuote();
+        $this->checkoutSession->loadCustomerQuote();
+        $quote = $this->checkoutSession->getQuote();
 
-            $quote = $this->checkoutSession->getQuote();
-            $quote->setCustomerIsGuest(0);
-            $this->quoteRepository->save($quote);
-        }
-        return $result;
+        $quote->setCustomerIsGuest(0);
+        $this->quoteRepository->save($quote);
     }
 }