Merge remote-tracking branch 'origin/module-login-as-customer' into issue-110

# Conflicts:
#	app/code/Magento/LoginAsCustomerUi/etc/adminhtml/system.xml

Author: naydav

app/code/Magento/LoginAsCustomer/Cron/DeleteExpiredAuthenticationData.php

@@ -50,20 +50,15 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(): void
+    public function execute(int $userId): void
     {
         $connection = $this->resourceConnection->getConnection();
         $tableName = $this->resourceConnection->getTableName('login_as_customer');
 
-        $timePoint = date(
-            'Y-m-d H:i:s',
-            $this->dateTime->gmtTimestamp() - $this->config->getAuthenticationDataExpirationTime()
-        );
-
         $connection->delete(
             $tableName,
             [
-                'created_at < ?' => $timePoint
+                'admin_id = ?' => $userId
             ]
         );
     }

app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteExpiredAuthenticationData.php

@@ -85,8 +85,8 @@ public function execute(string $secretKey): AuthenticationDataInterface
         /** @var AuthenticationDataInterface $authenticationData */
         $authenticationData = $this->authenticationDataFactory->create(
             [
-                'customerId' => (int)$data['admin_id'],
-                'adminId' => (int)$data['customer_id'],
+                'customerId' => (int)$data['customer_id'],
+                'adminId' => (int)$data['admin_id'],
                 'extensionAttributes' => null,
             ]
         );

app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php

@@ -8,12 +8,12 @@
 namespace Magento\LoginAsCustomer\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataBySecretInterface;
+use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface;
 
 /**
  * @inheritdoc
  */
-class DeleteAuthenticationDataBySecret implements DeleteAuthenticationDataBySecretInterface
+class IsLoginAsCustomerSessionActive implements IsLoginAsCustomerSessionActiveInterface
 {
     /**
      * @var ResourceConnection
@@ -32,16 +32,18 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(string $secret): void
+    public function execute(int $customerId, int $userId): bool
     {
-        $connection = $this->resourceConnection->getConnection();
         $tableName = $this->resourceConnection->getTableName('login_as_customer');
+        $connection = $this->resourceConnection->getConnection();
+
+        $query = $connection->select()
+            ->from($tableName)
+            ->where('customer_id = ?', $customerId)
+            ->where('admin_id = ?', $userId);
+
+        $result = $connection->fetchRow($query);
 
-        $connection->delete(
-            $tableName,
-            [
-                'secret = ?' => $secret
-            ]
-        );
+        return false !== $result;
     }
 }

app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteAuthenticationDataBySecret.php renamed to app/code/Magento/LoginAsCustomer/Model/ResourceModel/IsLoginAsCustomerSessionActive.php

@@ -13,4 +13,5 @@
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataBySecretInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataBySecret"/>
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteExpiredAuthenticationData"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
 </config>

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

@@ -15,9 +15,10 @@
 interface DeleteExpiredAuthenticationDataInterface
 {
     /**
-     * Delete expired authentication data
+     * Delete expired authentication data by user id.
      *
+     * @param int $userId
      * @return void
      */
-    public function execute(): void;
+    public function execute(int $userId): void;
 }

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

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api;
+
+/**
+ * Check if Login as Customer session is still active.
+ *
+ * @api
+ */
+interface IsLoginAsCustomerSessionActiveInterface
+{
+    /**
+     * Check if Login as Customer session is still active.
+     *
+     * @param int $customerId
+     * @param int $userId
+     * @return bool
+     */
+    public function execute(int $customerId, int $userId): bool;
+}

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

@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Data interface for login as customer log.
+ *
+ * @api
+ */
+interface LogInterface extends ExtensibleDataInterface
+{
+    const LOG_ID = 'log_id';
+    const TIME = 'time';
+    const CUSTOMER_ID = 'customer_id';
+    const CUSTOMER_EMAIL = 'customer_email';
+    const USER_ID = 'user_id';
+    const USERNAME = 'user_name';
+
+    /**
+     * Set login as customer log id.
+     *
+     * @param int $logId
+     * @return void
+     */
+    public function setLogId(int $logId): void;
+
+    /**
+     * Retrieve login as customer log id.
+     *
+     * @return null|int
+     */
+    public function getLogId(): ?int;
+
+    /**
+     * Set login as customer log time.
+     *
+     * @param string $time
+     * @return void
+     */
+    public function setTime(string $time): void;
+
+    /**
+     * Retrieve login as customer log time.
+     *
+     * @return null|string
+     */
+    public function getTime(): ?string;
+
+    /**
+     * Set login as customer log user id.
+     *
+     * @param int $userId
+     * @return void
+     */
+    public function setUserId(int $userId): void;
+
+    /**
+     * Retrieve login as customer log user id.
+     *
+     * @return null|int
+     */
+    public function getUserId(): ?int;
+
+    /**
+     * Set login as customer log user name.
+     *
+     * @param string $userName
+     * @return void
+     */
+    public function setUserName(string $userName): void;
+
+    /**
+     * Retrieve login as customer log user name.
+     *
+     * @return null|string
+     */
+    public function getUserName(): ?string;
+
+    /**
+     * Set login as customer log customer id.
+     *
+     * @param int $customerId
+     * @return void
+     */
+    public function setCustomerId(int $customerId): void;
+
+    /**
+     * Retrieve login as customer log customer id.
+     *
+     * @return null|int
+     */
+    public function getCustomerId(): ?int;
+
+    /**
+     * Set login as customer log customer email.
+     *
+     * @param string $customerEmail
+     * @return void
+     */
+    public function setCustomerEmail(string $customerEmail): void;
+
+    /**
+     * Retrieve login as customer log customer email.
+     *
+     * @return null|string
+     */
+    public function getCustomerEmail(): ?string;
+
+    /**
+     * Set log extension attributes.
+     *
+     * @param \Magento\LoginAsCustomerLog\Api\Data\LogExtensionInterface $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(LogExtensionInterface $extensionAttributes): void;
+
+    /**
+     * Retrieve log extension attributes.
+     *
+     * @return \Magento\LoginAsCustomerLog\Api\Data\LogExtensionInterface
+     */
+    public function getExtensionAttributes(): LogExtensionInterface;
+}

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

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Api\Data;
+
+use \Magento\Framework\Api\SearchResultsInterface;
+
+/**
+ * Login as customer log entity search results interface.
+ *
+ * @api
+ */
+interface LogSearchResultsInterface extends SearchResultsInterface
+{
+    /**
+     * Get log list.
+     *
+     * @return \Magento\LoginAsCustomerLog\Api\Data\LogInterface[]
+     */
+    public function getItems();
+
+    /**
+     * Set log list.
+     *
+     * @param \Magento\LoginAsCustomerLog\Api\Data\LogInterface[] $items
+     * @return void
+     */
+    public function setItems(array $items);
+}

app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Api;
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterface;
+
+/**
+ * Get login as customer log list considering search criteria.
+ *
+ * @api
+ */
+interface GetLogsListInterface
+{
+    /**
+     * Retrieve list of log entities.
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return LogSearchResultsInterface
+     */
+    public function execute(SearchCriteriaInterface $searchCriteria): LogSearchResultsInterface;
+}