Merge pull request #105 from magento-commerce/magento2-login-as-customer/issues/104

Magento2 login as customer/issues/104

Author: naydav

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

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Cron;
+
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface;
+
+/**
+ * elete expired authentication data cron task
+ */
+class DeleteExpiredAuthenticationData
+{
+    /**
+     * @var DeleteExpiredAuthenticationDataInterface
+     */
+    private $deleteOldSecretsProcessor;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor
+     * @param ConfigInterface $config
+     */
+    public function __construct(
+        DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor,
+        ConfigInterface $config
+    ) {
+        $this->deleteOldSecretsProcessor = $deleteOldSecretsProcessor;
+        $this->config = $config;
+    }
+
+    /**
+     * elete expired authentication data
+     */
+    public function execute(): void
+    {
+        if ($this->config->isEnabled()) {
+            $this->deleteOldSecretsProcessor->execute();
+        }
+    }
+}

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

@@ -8,10 +8,12 @@
 namespace Magento\LoginAsCustomer\Model;
 
 use Magento\Customer\Model\Session;
-use Magento\LoginAsCustomer\Api\AuthenticateCustomerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerInterface;
+use Magento\LoginAsCustomerApi\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);
+        $result = $this->customerSession->loginById($authenticationData->getCustomerId());
+        if (false === $result) {
+            throw new LocalizedException(__('Login was not successful.'));
         }
 
-        return $loggedIn;
+        $this->customerSession->regenerateId();
+        $this->customerSession->setLoggedAsCustomerAdmindId($authenticationData->getAdminId());
     }
 }

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

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model;
+
+use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
+use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataExtensionInterface;
+
+/**
+ * @inheritdoc
+ */
+class AuthenticationData implements AuthenticationDataInterface
+{
+    /**
+     * @var int
+     */
+    private $customerId;
+
+    /**
+     * @var int
+     */
+    private $adminId;
+
+    /**
+     * @var AuthenticationDataExtensionInterface|null
+     */
+    private $extensionAttributes;
+
+    /**
+     * @param int $customerId
+     * @param int $adminId
+     * @param AuthenticationDataExtensionInterface|null $extensionAttributes
+     */
+    public function __construct(
+        int $customerId,
+        int $adminId,
+        AuthenticationDataExtensionInterface $extensionAttributes = null
+    ) {
+        $this->customerId = $customerId;
+        $this->adminId = $adminId;
+        $this->extensionAttributes = $extensionAttributes;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCustomerId(): int
+    {
+        return $this->customerId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAdminId(): int
+    {
+        return $this->adminId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExtensionAttributes(): ?AuthenticationDataExtensionInterface
+    {
+        return $this->extensionAttributes;
+    }
+}