From 8be4c90104d5025a27b66440f9718799ca05240c Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 28 Apr 2020 19:31:19 +0300
Subject: [PATCH 1/4] LAC-27: Log admin actions with Login as Customer.

---
 .../Api/Data/LogInterface.php                 | 208 +++++++++++++++++
 .../Api/Data/LogSearchResultsInterface.php    |  28 +++
 .../Api/GetLogsListInterface.php              |  23 ++
 .../Block/Adminhtml/Login.php                 |  27 ---
 .../Controller/Adminhtml/Log/Index.php        |  34 +++
 .../Controller/Adminhtml/Login/Grid.php       |  36 ---
 .../Controller/Adminhtml/Login/Index.php      |  51 -----
 .../LoginAsCustomerLog/Model/GetLogList.php   |  80 +++++++
 .../Magento/LoginAsCustomerLog/Model/Log.php  | 215 ++++++++++++++++++
 .../Model/LogSearchResults.php                |  18 ++
 .../LoginAsCustomerLog/Model/Login.php        |  22 --
 .../Model/ResourceModel/Log.php               |  27 +++
 .../Model/ResourceModel/Log/Collection.php    |  26 +++
 .../Model/ResourceModel/Login.php             |  22 --
 .../Model/ResourceModel/Login/Collection.php  |  26 ---
 .../ResourceModel/Login/Grid/Collection.php   |  44 ----
 .../Ui/DataProvider/LogDataProvider.php       |  90 ++++++++
 .../LoginAsCustomerLog/etc/adminhtml/menu.xml |   2 +-
 .../etc/adminhtml/routes.xml                  |   2 +-
 .../LoginAsCustomerLog/etc/db_schema.xml      |  28 +++
 .../etc/db_schema_whitelist.json              |  23 ++
 .../Magento/LoginAsCustomerLog/etc/di.xml     |  12 +
 ....xml => loginascustomer_log_log_index.xml} |   4 +-
 .../layout/loginascustomer_login_grid.xml     |  14 --
 .../loginascustomer_login_grid_block.xml      |  66 ------
 .../login_as_customer_log_listing.xml         |  69 ++++++
 26 files changed, 884 insertions(+), 313 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/Block/Adminhtml/Login.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Grid.php
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Index.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Model/Log.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/Model/Login.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login.php
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Collection.php
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Grid/Collection.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
 create mode 100644 app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
 create mode 100755 app/code/Magento/LoginAsCustomerLog/etc/di.xml
 rename app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/{loginascustomer_login_index.xml => loginascustomer_log_log_index.xml} (66%)
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid.xml
 delete mode 100644 app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid_block.xml
 create mode 100644 app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml

diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
new file mode 100644
index 0000000000000..d77e83bd1c8c0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
@@ -0,0 +1,208 @@
+<?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.
+ */
+interface LogInterface extends ExtensibleDataInterface
+{
+    const LOG_ID = 'log_id';
+    const TIME = 'time';
+    const ACTION_GROUP = 'action_group';
+    const ACTION = 'action';
+    const FULL_ACTION_NAME = 'full_action_name';
+    const RESULT = 'result';
+    const DETAILS = 'details';
+    const ERROR = 'error';
+    const IP_ADDRESS = 'ip_address';
+    const USERNAME = 'username';
+    const CUSTOMER_ID = 'customer_id';
+
+    /**
+     * 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 $name
+     * @return void
+     */
+    public function setTime(string $name): void;
+
+    /**
+     * Retrieve login as customer log time.
+     *
+     * @return null|string
+     */
+    public function getTime(): ?string;
+
+    /**
+     * Set login as customer log action group.
+     *
+     * @param string $actionGroup
+     * @return void
+     */
+    public function setActionGroup(string $actionGroup): void;
+
+    /**
+     * Retrieve login as customer log action group.
+     *
+     * @return null|string
+     */
+    public function getActionGroup(): ?string;
+
+    /**
+     * Set login as customer log action.
+     *
+     * @param string $action
+     * @return void
+     */
+    public function setAction(string $action): void;
+
+    /**
+     * Retrieve login as customer log action.
+     *
+     * @return null|string
+     */
+    public function getAction(): ?string;
+
+    /**
+     * Set login as customer log full action name.
+     *
+     * @param string $fullActionName
+     * @return void
+     */
+    public function setFullActionName(string $fullActionName): void;
+
+    /**
+     * Retrieve login as customer log full action name.
+     *
+     * @return null|string
+     */
+    public function getFullActionName(): ?string;
+
+    /**
+     * Set login as customer log result.
+     *
+     * @param int $result
+     * @return void
+     */
+    public function setResult(int $result): void;
+
+    /**
+     * Retrieve login as customer log result.
+     *
+     * @return null|int
+     */
+    public function getResult(): ?int;
+
+    /**
+     * Set login as customer log details.
+     *
+     * @param string $details
+     * @return void
+     */
+    public function setDetails(string $details): void;
+
+    /**
+     * Retrieve login as customer log details.
+     *
+     * @return null|string
+     */
+    public function getDetails(): ?string;
+
+    /**
+     * Set login as customer log error.
+     *
+     * @param string $error
+     * @return void
+     */
+    public function setError(string $error): void;
+
+    /**
+     * Retrieve login as customer log error.
+     *
+     * @return string|null
+     */
+    public function getError(): ?string;
+
+    /**
+     * Set login as customer log ip address.
+     *
+     * @param int $ipAddress
+     * @return void
+     */
+    public function setIpAddress(int $ipAddress): void;
+
+    /**
+     * Retrieve login as customer log ip address.
+     *
+     * @return null|int
+     */
+    public function getIpAddress(): ?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 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;
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
new file mode 100644
index 0000000000000..817e580d919df
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
@@ -0,0 +1,28 @@
+<?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;
+
+interface LogSearchResultsInterface extends SearchResultsInterface
+{
+    /**
+     * Get sources list
+     *
+     * @return \Magento\LoginAsCustomerLog\Api\Data\LogInterface[]
+     */
+    public function getItems();
+
+    /**
+     * Set sources list
+     *
+     * @param \Magento\LoginAsCustomerLog\Api\Data\LogInterface[] $items
+     * @return void
+     */
+    public function setItems(array $items);
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
new file mode 100644
index 0000000000000..759fb6326ed33
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
@@ -0,0 +1,23 @@
+<?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;
+
+/**
+ * @todo: add description.
+ */
+interface GetLogsListInterface
+{
+    /**
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return LogSearchResultsInterface
+     */
+    public function execute(SearchCriteriaInterface $searchCriteria): LogSearchResultsInterface;
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Block/Adminhtml/Login.php b/app/code/Magento/LoginAsCustomerLog/Block/Adminhtml/Login.php
deleted file mode 100644
index bd0bed09fa97b..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/Block/Adminhtml/Login.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomerLog\Block\Adminhtml;
-
-/**
- * Login as customer log
- *
- * @api
- */
-class Login extends \Magento\Backend\Block\Widget\Grid\Container
-{
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->removeButton('add');
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php b/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php
new file mode 100644
index 0000000000000..4911a06b5eff6
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Controller\Adminhtml\Log;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Login As Customer log grid controller.
+ */
+class Index extends Action implements HttpGetActionInterface
+{
+    const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login_log';
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): ResultInterface
+    {
+        $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+        $resultPage->setActiveMenu('Magento_LoginAsCustomerLog::login_log')
+            ->addBreadcrumb(__('Login as Customer Log'), __('List'));
+        $resultPage->getConfig()->getTitle()->prepend(__('Login as Customer Log'));
+
+        return $resultPage;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Grid.php b/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Grid.php
deleted file mode 100644
index ca47050199598..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Grid.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomerLog\Controller\Adminhtml\Login;
-
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Backend\App\Action;
-
-/**
- * Login As Customer log grid ajax action
- */
-class Grid extends Action implements HttpPostActionInterface
-{
-    /**
-     * Authorization level of a basic admin session
-     *
-     * @see _isAllowed()
-     */
-    const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login_log';
-
-    /**
-     * Login as customer log ajax grid
-     *
-     * @return ResultInterface
-     */
-    public function execute(): ResultInterface
-    {
-        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Index.php b/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Index.php
deleted file mode 100644
index b1a65efc217e1..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Index.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomerLog\Controller\Adminhtml\Login;
-
-use Magento\Backend\Model\View\Result\Page;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Backend\App\Action;
-
-/**
- * Login As Customer log grid action
- * This action can be executed via GET when just visiting Grid page and POST ajax when filtering, sorting grid
- */
-class Index extends Action implements HttpGetActionInterface, HttpPostActionInterface
-{
-    /**
-     * Authorization level of a basic admin session
-     *
-     * @see _isAllowed()
-     */
-    const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login_log';
-
-    /**
-     * Login As Customer log grid action
-     *
-     * @return ResultInterface
-     */
-    public function execute():ResultInterface
-    {
-        if ($this->getRequest()->isXmlHttpRequest()) {
-            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
-            $resultForward->forward('grid');
-            return $resultForward;
-        }
-
-        /** @var Page $resultPage */
-        $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
-        $resultPage->setActiveMenu('Magento_LoginAsCustomerLog::login_log')
-            ->addBreadcrumb(__('Customer'), __('Login As Customer Log'));
-        $resultPage->getConfig()->getTitle()->prepend(__('Login As Customer Log'));
-
-        return $resultPage;
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php b/app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php
new file mode 100644
index 0000000000000..e5c7f9a1b9aec
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Model;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterface;
+use Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterfaceFactory;
+use Magento\LoginAsCustomerLog\Api\GetLogsListInterface;
+use Magento\LoginAsCustomerLog\Model\ResourceModel\Log\CollectionFactory;
+
+/**
+ * @inheritDoc
+ */
+class GetLogList implements GetLogsListInterface
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $logCollectionFactory;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var LogSearchResultsInterfaceFactory
+     */
+    private $logSearchResultsFactory;
+
+    /**
+     * @param CollectionFactory $logCollectionFactory
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param LogSearchResultsInterfaceFactory $logSearchResultsFactory
+     */
+    public function __construct(
+        CollectionFactory $logCollectionFactory,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        CollectionProcessorInterface $collectionProcessor,
+        LogSearchResultsInterfaceFactory $logSearchResultsFactory
+    ) {
+        $this->logCollectionFactory = $logCollectionFactory;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->collectionProcessor = $collectionProcessor;
+        $this->logSearchResultsFactory = $logSearchResultsFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(SearchCriteriaInterface $searchCriteria = null): LogSearchResultsInterface
+    {
+        $collection = $this->logCollectionFactory->create();
+        if (null === $searchCriteria) {
+            $searchCriteria = $this->searchCriteriaBuilder->create();
+        } else {
+            $this->collectionProcessor->process($searchCriteria, $collection);
+        }
+
+        $searchResult = $this->logSearchResultsFactory->create();
+        $searchResult->setItems($collection->getItems());
+        $searchResult->setTotalCount($collection->getSize());
+        $searchResult->setSearchCriteria($searchCriteria);
+
+        return $searchResult;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/Log.php b/app/code/Magento/LoginAsCustomerLog/Model/Log.php
new file mode 100644
index 0000000000000..1ce2f4edceb3f
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Model/Log.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Model;
+
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\LoginAsCustomerLog\Api\Data\LogExtensionInterface;
+use Magento\LoginAsCustomerLog\Api\Data\LogInterface;
+
+/**
+ * @inheritDoc
+ */
+class Log extends AbstractExtensibleModel implements LogInterface
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function setLogId(int $logId): void
+    {
+        $this->setData(LogInterface::LOG_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLogId(): ?int
+    {
+        return $this->getData(LogInterface::LOG_ID) ? (int)$this->getData(LogInterface::LOG_ID) : null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setTime(string $name): void
+    {
+        $this->setData(LogInterface::TIME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTime(): ?string
+    {
+        return $this->getData(LogInterface::TIME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setActionGroup(string $actionGroup): void
+    {
+        $this->setData(LogInterface::ACTION_GROUP);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getActionGroup(): ?string
+    {
+        return $this->getData(LogInterface::ACTION_GROUP);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setAction(string $action): void
+    {
+        $this->setData(LogInterface::ACTION);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAction(): ?string
+    {
+        return $this->getData(LogInterface::ACTION);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setFullActionName(string $fullActionName): void
+    {
+        $this->setData(LogInterface::FULL_ACTION_NAME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFullActionName(): ?string
+    {
+        return $this->getData(LogInterface::FULL_ACTION_NAME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setResult(int $result): void
+    {
+        $this->setData(LogInterface::RESULT);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getResult(): ?int
+    {
+        return $this->getData(LogInterface::RESULT);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setDetails(string $details): void
+    {
+        $this->setData(LogInterface::DETAILS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDetails(): ?string
+    {
+        return $this->getData(LogInterface::DETAILS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setError(string $error): void
+    {
+        $this->setData(LogInterface::ERROR);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getError(): ?string
+    {
+        return $this->getData(LogInterface::ERROR);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setIpAddress(int $ipAddress): void
+    {
+        $this->setData(LogInterface::IP_ADDRESS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIpAddress(): ?int
+    {
+        return $this->getData(LogInterface::IP_ADDRESS)
+            ? (int)$this->getData(LogInterface::IP_ADDRESS)
+            : null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setUsername(string $username): void
+    {
+        $this->setData(LogInterface::USERNAME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUsername(): ?string
+    {
+        return $this->getData(LogInterface::USERNAME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setCustomerId(int $customerId): void
+    {
+        $this->setData(LogInterface::CUSTOMER_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getCustomerId(): ?int
+    {
+        return $this->getData(LogInterface::CUSTOMER_ID) ?
+            (int)$this->getData(LogInterface::CUSTOMER_ID)
+            : null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(LogExtensionInterface $extensionAttributes): void
+    {
+        $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getExtensionAttributes(): LogExtensionInterface
+    {
+        return $this->_getExtensionAttributes();
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php b/app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php
new file mode 100644
index 0000000000000..da85cc06c0865
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterface;
+
+/**
+ * todo: add description.
+ */
+class LogSearchResults extends SearchResults implements LogSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/Login.php b/app/code/Magento/LoginAsCustomerLog/Model/Login.php
deleted file mode 100644
index e8092dbd02dc3..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/Model/Login.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomerLog\Model;
-
-/**
- * Login model
- */
-class Login extends \Magento\Framework\Model\AbstractModel
-{
-    /**
-     * @inheritdoc
-     */
-    protected function _construct()
-    {
-        $this->_init(\Magento\LoginAsCustomerLog\Model\ResourceModel\Login::class);
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.php
new file mode 100644
index 0000000000000..45b6bde6abab5
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.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\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\LoginAsCustomerLog\Api\Data\LogInterface;
+
+/**
+ * Todo: add description.
+ */
+class Log extends AbstractDb
+{
+    const TABLE_NAME_LOG = 'magento_login_as_customer_log';
+
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init(self::TABLE_NAME_LOG, LogInterface::LOG_ID);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php
new file mode 100644
index 0000000000000..a700b96cfaff0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Model\ResourceModel\Log;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\LoginAsCustomerLog\Model\Log;
+use Magento\LoginAsCustomerLog\Model\ResourceModel\Log as LogResource;
+
+/**
+ * Todo: add description.
+ */
+class Collection extends AbstractCollection
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init(Log::class, LogResource::class);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login.php
deleted file mode 100644
index 91c360e3717c0..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomerLog\Model\ResourceModel;
-
-/**
- * LoginAsCustomerLog resource model
- */
-class Login extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-{
-    /**
-     * @inheritdoc
-     */
-    protected function _construct()
-    {
-        $this->_init('login_as_customer', 'secret');
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Collection.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Collection.php
deleted file mode 100644
index 8b2f270499987..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Collection.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomerLog\Model\ResourceModel\Login;
-
-/**
- * LoginAsCustomerLog collection
- */
-class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-{
-    /**
-     * @inheritdoc
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->_init(
-            \Magento\LoginAsCustomerLog\Model\Login::class,
-            \Magento\LoginAsCustomerLog\Model\ResourceModel\Login::class
-        );
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Grid/Collection.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Grid/Collection.php
deleted file mode 100644
index 1b91d2afc11b2..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Grid/Collection.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomerLog\Model\ResourceModel\Login\Grid;
-
-/**
- * LoginAsCustomerLog collection
- */
-class Collection extends \Magento\LoginAsCustomerLog\Model\ResourceModel\Login\Collection
-{
-    /**
-     * @inheritdoc
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->_map['fields']['email'] = 'c.email';
-    }
-
-    /**
-     * Init collection select
-     *
-     * @return $this
-     */
-    protected function _initSelect(): self
-    {
-        parent::_initSelect();
-        $this->getSelect()
-            ->joinLeft(
-                ['c' => $this->getTable('customer_entity')],
-                'c.entity_id = main_table.customer_id',
-                ['email']
-            )->joinLeft(
-                ['a' => $this->getTable('admin_user')],
-                'a.user_id = main_table.admin_id',
-                ['username']
-            );
-        return $this;
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php b/app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php
new file mode 100644
index 0000000000000..41a052f283fbd
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Ui\DataProvider;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\ReportingInterface;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider;
+use Magento\LoginAsCustomerLog\Api\Data\LogInterface;
+use Magento\LoginAsCustomerLog\Api\GetLogsListInterface;
+use Magento\Ui\DataProvider\SearchResultFactory;
+
+/**
+ * @inheritDoc
+ */
+class LogDataProvider extends DataProvider
+{
+    /**
+     * @var GetLogsListInterface
+     */
+    private $logRepository;
+
+    /**
+     * @var SearchResultFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @param $name
+     * @param $primaryFieldName
+     * @param $requestFieldName
+     * @param ReportingInterface $reporting
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param RequestInterface $request
+     * @param FilterBuilder $filterBuilder
+     * @param GetLogsListInterface $logRepository
+     * @param SearchResultFactory $searchResultFactory
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        ReportingInterface $reporting,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        RequestInterface $request,
+        FilterBuilder $filterBuilder,
+        GetLogsListInterface $logRepository,
+        SearchResultFactory $searchResultFactory,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct(
+            $name,
+            $primaryFieldName,
+            $requestFieldName,
+            $reporting,
+            $searchCriteriaBuilder,
+            $request,
+            $filterBuilder,
+            $meta,
+            $data
+        );
+        $this->logRepository = $logRepository;
+        $this->searchResultFactory = $searchResultFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSearchResult()
+    {
+        $searchCriteria = $this->getSearchCriteria();
+        $result = $this->logRepository->execute($searchCriteria);
+
+        return $this->searchResultFactory->create(
+            $result->getItems(),
+            $result->getTotalCount(),
+            $searchCriteria,
+            LogInterface::LOG_ID
+        );
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml b/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml
index f3fd02874e04e..e44b41b9b8a6a 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml
+++ b/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml
@@ -14,6 +14,6 @@
              parent="Magento_Customer::customer"
              sortOrder="40"
              resource="Magento_LoginAsCustomer::login_log"
-             action="loginascustomer"/>
+             action="loginascustomer_log/log/index"/>
     </menu>
 </config>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/routes.xml b/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/routes.xml
index 3c3df84a63424..9201e5e7ac91f 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/routes.xml
+++ b/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="admin">
-        <route id="loginascustomer_log" frontName="loginascustomer-log">
+        <route id="loginascustomer_log" frontName="loginascustomer_log">
             <module name="Magento_LoginAsCustomerLog"/>
         </route>
     </router>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml b/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
new file mode 100644
index 0000000000000..9d72b3fa26128
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="magento_login_as_customer_log" resource="default" engine="innodb" comment="Login as Customer Logging">
+        <column xsi:type="int" name="log_id" padding="11" unsigned="false" nullable="false" identity="true" comment="Log Id"/>
+        <column xsi:type="bigint" name="ip" padding="20" unsigned="false" nullable="false" identity="false" default="0" comment="Ip address"/>
+        <column xsi:type="bigint" name="x_forwarded_ip" padding="20" unsigned="false" nullable="false" identity="false" default="0" comment="Real ip address if visitor used proxy"/>
+        <column xsi:type="varchar" name="event_code" nullable="true" length="100" comment="Event Code"/>
+        <column xsi:type="timestamp" name="time" on_update="false" nullable="true" comment="Even date"/>
+        <column xsi:type="varchar" name="action" nullable="true" length="20" comment="Event action"/>
+        <column xsi:type="text" name="info" nullable="true"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="15" comment="Status"/>
+        <column xsi:type="varchar" name="user" nullable="true" length="40" comment="User name"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false" comment="User Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false" comment="Customer Id"/>
+        <column xsi:type="varchar" name="fullaction" nullable="true" length="200" comment="Full action description"/>
+        <column xsi:type="text" name="error_message" nullable="true" comment="Error Message"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="log_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="MAGENTO_LOGIN_AS_CUSTOMER_LOG_USER_ID_ADMIN_USER_USER_ID" table="magento_login_as_customer_log" column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="SET NULL"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json b/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..ca53da9475b2c
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
@@ -0,0 +1,23 @@
+{
+    "magento_login_as_customer_log": {
+        "column": {
+            "log_id": true,
+            "ip": true,
+            "x_forwarded_ip": true,
+            "event_code": true,
+            "time": true,
+            "action": true,
+            "info": true,
+            "status": true,
+            "user": true,
+            "user_id": true,
+            "customer_id": true,
+            "fullaction": true,
+            "error_message": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "MAGENTO_LOGIN_AS_CUSTOMER_LOG_USER_ID_ADMIN_USER_USER_ID": true
+        }
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/di.xml b/app/code/Magento/LoginAsCustomerLog/etc/di.xml
new file mode 100755
index 0000000000000..4c90d5c417ebb
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/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\LoginAsCustomerLog\Api\Data\LogInterface" type="Magento\LoginAsCustomerLog\Model\Log"/>
+    <preference for="Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterface" type="Magento\LoginAsCustomerLog\Model\LogSearchResults"/>
+    <preference for="Magento\LoginAsCustomerLog\Api\GetLogsListInterface" type="Magento\LoginAsCustomerLog\Model\GetLogList"/>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_index.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_log_log_index.xml
similarity index 66%
rename from app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_index.xml
rename to app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_log_log_index.xml
index 50d0a83210176..4ec4853877419 100644
--- a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_index.xml
+++ b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_log_log_index.xml
@@ -6,11 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="formkey"/>
-    <update handle="loginascustomer_login_grid_block"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\LoginAsCustomerLog\Block\Adminhtml\Login" name="loginascustomer.container"/>
+            <uiComponent name="login_as_customer_log_listing"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid.xml
deleted file mode 100644
index e298729b5422b..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
-    <update handle="formkey"/>
-    <update handle="loginascustomer_login_grid_block"/>
-    <container name="root">
-        <block class="Magento\Backend\Block\Widget\Grid\Container" name="loginascustomer.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-    </container>
-</layout>
diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid_block.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid_block.xml
deleted file mode 100644
index 68f0d857be082..0000000000000
--- a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/layout/loginascustomer_login_grid_block.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <body>
-        <referenceBlock name="loginascustomer.container">
-            <block class="Magento\Backend\Block\Widget\Grid" name="loginascustomer.grid" as="grid">
-                <arguments>
-                    <argument name="id" xsi:type="string">subscriberGrid</argument>
-                    <argument name="dataSource" xsi:type="object">Magento\LoginAsCustomerLog\Model\ResourceModel\Login\Grid\Collection</argument>
-                    <argument name="default_sort" xsi:type="string">created_at</argument>
-                    <argument name="default_dir" xsi:type="string">desc</argument>
-                    <argument name="use_ajax" xsi:type="string">1</argument>
-                </arguments>
-
-                <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="loginascustomer.grid.columnSet" as="grid.columnSet">
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.customerId" as="customer_id">
-                        <arguments>
-                            <argument name="header" xsi:type="string" translate="true">Customer ID</argument>
-                            <argument name="index" xsi:type="string">customer_id</argument>
-                            <argument name="header_css_class" xsi:type="string">col-title</argument>
-                            <argument name="column_css_class" xsi:type="string">col-title</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.email" as="email">
-                        <arguments>
-                            <argument name="header" xsi:type="string" translate="true">Customer Email</argument>
-                            <argument name="index" xsi:type="string">email</argument>
-                            <argument name="header_css_class" xsi:type="string">col-title</argument>
-                            <argument name="column_css_class" xsi:type="string">col-title</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.adminId" as="admin_id">
-                        <arguments>
-                            <argument name="header" xsi:type="string" translate="true">Admin ID</argument>
-                            <argument name="index" xsi:type="string">admin_id</argument>
-                            <argument name="header_css_class" xsi:type="string">col-title</argument>
-                            <argument name="column_css_class" xsi:type="string">col-title</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.username" as="username">
-                        <arguments>
-                            <argument name="header" xsi:type="string" translate="true">Admin Name</argument>
-                            <argument name="index" xsi:type="string">username</argument>
-                            <argument name="header_css_class" xsi:type="string">col-title</argument>
-                            <argument name="column_css_class" xsi:type="string">col-title</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.createdAt" as="created_at">
-                        <arguments>
-                            <argument name="header" xsi:type="string" translate="true">Logged In</argument>
-                            <argument name="index" xsi:type="string">created_at</argument>
-                            <argument name="type" xsi:type="string">datetime</argument>
-                            <argument name="header_css_class" xsi:type="string">col-first-name</argument>
-                            <argument name="column_css_class" xsi:type="string">col-first-name</argument>
-                        </arguments>
-                    </block>
-                </block>
-            </block>
-        </referenceBlock>
-    </body>
-</page>
diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
new file mode 100644
index 0000000000000..21762e11081b4
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">login_as_customer_log_listing.login_as_customer_log_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>login_as_customer_log_listing_columns</spinner>
+        <deps>
+            <dep>login_as_customer_log_listing.login_as_customer_log_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="login_as_customer_log_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">log_id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_LoginAsCustomer::login_log</aclResource>
+        <dataProvider class="Magento\LoginAsCustomerLog\Ui\DataProvider\LogDataProvider" name="login_as_customer_log_listing_data_source">
+            <settings>
+                <requestFieldName>log_id</requestFieldName>
+                <primaryFieldName>log_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <settings>
+            <sticky>true</sticky>
+        </settings>
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <filterSearch name="name"/>
+        <filters name="listing_filters">
+            <settings>
+                <templates>
+                    <filters>
+                        <select>
+                            <param name="template" xsi:type="string">ui/grid/filters/elements/ui-select</param>
+                            <param name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</param>
+                        </select>
+                    </filters>
+                </templates>
+            </settings>
+        </filters>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="login_as_customer_log_listing_columns">
+        <column name="username" sortOrder="10">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">User Name</label>
+                <editor>
+                    <validation>
+                        <rule name="required-entry" xsi:type="boolean">true</rule>
+                    </validation>
+                </editor>
+            </settings>
+        </column>
+    </columns>
+</listing>

From 5b402d5167a3b29ad5d79adbb15b8cd502b67586 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 29 Apr 2020 11:24:57 +0300
Subject: [PATCH 2/4] LAC-27: Log admin actions with Login as Customer.

---
 .../Api/Data/LogInterface.php                 | 130 ++++--------------
 .../Api/Data/LogSearchResultsInterface.php    |   7 +-
 .../Api/GetLogsListInterface.php              |   4 +-
 .../Api/SaveLogsInterface.php                 |  22 +++
 .../Magento/LoginAsCustomerLog/Model/Log.php  | 122 +++-------------
 .../Model/LogSearchResults.php                |   2 +-
 .../Model/ResourceModel/Log.php               |   2 +-
 .../Model/ResourceModel/Log/Collection.php    |   2 +-
 .../Model/ResourceModel/SaveLogs.php          |  55 ++++++++
 .../LogAuthenticationPlugin.php               |  85 ++++++++++++
 .../LoginAsCustomerLog/etc/db_schema.xml      |  14 +-
 .../etc/db_schema_whitelist.json              |  15 +-
 .../Magento/LoginAsCustomerLog/etc/di.xml     |   1 +
 .../LoginAsCustomerLog/etc/frontend/di.xml    |  12 ++
 .../login_as_customer_log_listing.xml         |  41 ++++--
 15 files changed, 270 insertions(+), 244 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php
 create mode 100644 app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php
 create mode 100755 app/code/Magento/LoginAsCustomerLog/etc/frontend/di.xml

diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
index d77e83bd1c8c0..587745b6e7ecc 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
@@ -16,15 +16,10 @@ interface LogInterface extends ExtensibleDataInterface
 {
     const LOG_ID = 'log_id';
     const TIME = 'time';
-    const ACTION_GROUP = 'action_group';
-    const ACTION = 'action';
-    const FULL_ACTION_NAME = 'full_action_name';
-    const RESULT = 'result';
-    const DETAILS = 'details';
-    const ERROR = 'error';
-    const IP_ADDRESS = 'ip_address';
-    const USERNAME = 'username';
     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.
@@ -44,10 +39,10 @@ public function getLogId(): ?int;
     /**
      * Set login as customer log time.
      *
-     * @param string $name
+     * @param string $time
      * @return void
      */
-    public function setTime(string $name): void;
+    public function setTime(string $time): void;
 
     /**
      * Retrieve login as customer log time.
@@ -57,139 +52,64 @@ public function setTime(string $name): void;
     public function getTime(): ?string;
 
     /**
-     * Set login as customer log action group.
+     * Set login as customer log user id.
      *
-     * @param string $actionGroup
+     * @param int $userId
      * @return void
      */
-    public function setActionGroup(string $actionGroup): void;
+    public function setUserId(int $userId): void;
 
     /**
-     * Retrieve login as customer log action group.
-     *
-     * @return null|string
-     */
-    public function getActionGroup(): ?string;
-
-    /**
-     * Set login as customer log action.
-     *
-     * @param string $action
-     * @return void
-     */
-    public function setAction(string $action): void;
-
-    /**
-     * Retrieve login as customer log action.
-     *
-     * @return null|string
-     */
-    public function getAction(): ?string;
-
-    /**
-     * Set login as customer log full action name.
-     *
-     * @param string $fullActionName
-     * @return void
-     */
-    public function setFullActionName(string $fullActionName): void;
-
-    /**
-     * Retrieve login as customer log full action name.
-     *
-     * @return null|string
-     */
-    public function getFullActionName(): ?string;
-
-    /**
-     * Set login as customer log result.
-     *
-     * @param int $result
-     * @return void
-     */
-    public function setResult(int $result): void;
-
-    /**
-     * Retrieve login as customer log result.
+     * Retrieve login as customer log user id.
      *
      * @return null|int
      */
-    public function getResult(): ?int;
+    public function getUserId(): ?int;
 
     /**
-     * Set login as customer log details.
+     * Set login as customer log user name.
      *
-     * @param string $details
+     * @param string $userName
      * @return void
      */
-    public function setDetails(string $details): void;
+    public function setUserName(string $userName): void;
 
     /**
-     * Retrieve login as customer log details.
+     * Retrieve login as customer log user name.
      *
      * @return null|string
      */
-    public function getDetails(): ?string;
+    public function getUserName(): ?string;
 
     /**
-     * Set login as customer log error.
-     *
-     * @param string $error
-     * @return void
-     */
-    public function setError(string $error): void;
-
-    /**
-     * Retrieve login as customer log error.
-     *
-     * @return string|null
-     */
-    public function getError(): ?string;
-
-    /**
-     * Set login as customer log ip address.
+     * Set login as customer log customer id.
      *
-     * @param int $ipAddress
+     * @param int $customerId
      * @return void
      */
-    public function setIpAddress(int $ipAddress): void;
+    public function setCustomerId(int $customerId): void;
 
     /**
-     * Retrieve login as customer log ip address.
+     * Retrieve login as customer log customer id.
      *
      * @return null|int
      */
-    public function getIpAddress(): ?int;
+    public function getCustomerId(): ?int;
 
     /**
-     * Set login as customer log user name.
+     * Set login as customer log customer email.
      *
-     * @param string $username
+     * @param string $customerEmail
      * @return void
      */
-    public function setUsername(string $username): void;
+    public function setCustomerEmail(string $customerEmail): void;
 
     /**
-     * Retrieve login as customer log user name.
+     * Retrieve login as customer log customer email.
      *
      * @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;
+    public function getCustomerEmail(): ?string;
 
     /**
      * Set log extension attributes.
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
index 817e580d919df..58c28f55a4b1b 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
@@ -9,17 +9,20 @@
 
 use \Magento\Framework\Api\SearchResultsInterface;
 
+/**
+ * Login as customer log entity search results interface.
+ */
 interface LogSearchResultsInterface extends SearchResultsInterface
 {
     /**
-     * Get sources list
+     * Get log list.
      *
      * @return \Magento\LoginAsCustomerLog\Api\Data\LogInterface[]
      */
     public function getItems();
 
     /**
-     * Set sources list
+     * Set log list.
      *
      * @param \Magento\LoginAsCustomerLog\Api\Data\LogInterface[] $items
      * @return void
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
index 759fb6326ed33..9face90f18fc9 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
@@ -11,11 +11,13 @@
 use Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterface;
 
 /**
- * @todo: add description.
+ * Get login as customer log list considering search criteria.
  */
 interface GetLogsListInterface
 {
     /**
+     * Retrieve list of log entities.
+     *
      * @param SearchCriteriaInterface $searchCriteria
      * @return LogSearchResultsInterface
      */
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
new file mode 100644
index 0000000000000..7ca95263aedfb
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Api;
+
+/**
+ * Save login as custom logs entities.
+ */
+interface SaveLogsInterface
+{
+    /**
+     * Save logs.
+     *
+     * @param \Magento\LoginAsCustomerLog\Api\Data\LogInterface[] $logs
+     * @return void
+     */
+    public function execute(array $logs): void;
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/Log.php b/app/code/Magento/LoginAsCustomerLog/Model/Log.php
index 1ce2f4edceb3f..b99f9a7fb30cd 100644
--- a/app/code/Magento/LoginAsCustomerLog/Model/Log.php
+++ b/app/code/Magento/LoginAsCustomerLog/Model/Log.php
@@ -22,7 +22,7 @@ class Log extends AbstractExtensibleModel implements LogInterface
      */
     public function setLogId(int $logId): void
     {
-        $this->setData(LogInterface::LOG_ID);
+        $this->setData(LogInterface::LOG_ID, $logId);
     }
 
     /**
@@ -36,9 +36,9 @@ public function getLogId(): ?int
     /**
      * @inheritDoc
      */
-    public function setTime(string $name): void
+    public function setTime(string $time): void
     {
-        $this->setData(LogInterface::TIME);
+        $this->setData(LogInterface::TIME, $time);
     }
 
     /**
@@ -52,149 +52,67 @@ public function getTime(): ?string
     /**
      * @inheritDoc
      */
-    public function setActionGroup(string $actionGroup): void
+    public function setUserId(int $userId): void
     {
-        $this->setData(LogInterface::ACTION_GROUP);
+        $this->setData(LogInterface::USER_ID, $userId);
     }
 
     /**
      * @inheritDoc
      */
-    public function getActionGroup(): ?string
+    public function getUserId(): ?int
     {
-        return $this->getData(LogInterface::ACTION_GROUP);
+        return $this->getData(LogInterface::USER_ID) ? (int)$this->getData(LogInterface::USER_ID) : null;
     }
 
     /**
      * @inheritDoc
      */
-    public function setAction(string $action): void
+    public function setUserName(string $userName): void
     {
-        $this->setData(LogInterface::ACTION);
+        $this->setData(LogInterface::USERNAME, $userName);
     }
 
     /**
      * @inheritDoc
      */
-    public function getAction(): ?string
+    public function getUserName(): ?string
     {
-        return $this->getData(LogInterface::ACTION);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setFullActionName(string $fullActionName): void
-    {
-        $this->setData(LogInterface::FULL_ACTION_NAME);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getFullActionName(): ?string
-    {
-        return $this->getData(LogInterface::FULL_ACTION_NAME);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setResult(int $result): void
-    {
-        $this->setData(LogInterface::RESULT);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getResult(): ?int
-    {
-        return $this->getData(LogInterface::RESULT);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setDetails(string $details): void
-    {
-        $this->setData(LogInterface::DETAILS);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getDetails(): ?string
-    {
-        return $this->getData(LogInterface::DETAILS);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setError(string $error): void
-    {
-        $this->setData(LogInterface::ERROR);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getError(): ?string
-    {
-        return $this->getData(LogInterface::ERROR);
+        return $this->getData(LogInterface::USERNAME);
     }
 
     /**
      * @inheritDoc
      */
-    public function setIpAddress(int $ipAddress): void
+    public function setCustomerId(int $customerId): void
     {
-        $this->setData(LogInterface::IP_ADDRESS);
+        $this->setData(LogInterface::CUSTOMER_ID, $customerId);
     }
 
     /**
      * @inheritDoc
      */
-    public function getIpAddress(): ?int
+    public function getCustomerId(): ?int
     {
-        return $this->getData(LogInterface::IP_ADDRESS)
-            ? (int)$this->getData(LogInterface::IP_ADDRESS)
+        return $this->getData(LogInterface::CUSTOMER_ID) ?
+            (int)$this->getData(LogInterface::CUSTOMER_ID)
             : null;
     }
 
     /**
      * @inheritDoc
      */
-    public function setUsername(string $username): void
+    public function setCustomerEmail(string $customerEmail): void
     {
-        $this->setData(LogInterface::USERNAME);
+        $this->setData(LogInterface::CUSTOMER_EMAIL, $customerEmail);
     }
 
     /**
      * @inheritDoc
      */
-    public function getUsername(): ?string
+    public function getCustomerEmail(): ?string
     {
-        return $this->getData(LogInterface::USERNAME);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setCustomerId(int $customerId): void
-    {
-        $this->setData(LogInterface::CUSTOMER_ID);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getCustomerId(): ?int
-    {
-        return $this->getData(LogInterface::CUSTOMER_ID) ?
-            (int)$this->getData(LogInterface::CUSTOMER_ID)
-            : null;
+        return $this->getData(LogInterface::CUSTOMER_EMAIL);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php b/app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php
index da85cc06c0865..2def7b0e09c6c 100644
--- a/app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php
+++ b/app/code/Magento/LoginAsCustomerLog/Model/LogSearchResults.php
@@ -11,7 +11,7 @@
 use Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterface;
 
 /**
- * todo: add description.
+ * @inheritDoc
  */
 class LogSearchResults extends SearchResults implements LogSearchResultsInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.php
index 45b6bde6abab5..11c142c078322 100644
--- a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.php
+++ b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log.php
@@ -11,7 +11,7 @@
 use Magento\LoginAsCustomerLog\Api\Data\LogInterface;
 
 /**
- * Todo: add description.
+ * Login as customer log resource model.
  */
 class Log extends AbstractDb
 {
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php
index a700b96cfaff0..a5df9a0067ad1 100644
--- a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php
+++ b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Log/Collection.php
@@ -12,7 +12,7 @@
 use Magento\LoginAsCustomerLog\Model\ResourceModel\Log as LogResource;
 
 /**
- * Todo: add description.
+ * Login as customer log entities collection.
  */
 class Collection extends AbstractCollection
 {
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php
new file mode 100644
index 0000000000000..42fb45ad738c8
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\LoginAsCustomerLog\Api\SaveLogsInterface;
+
+/**
+ * @inheritDoc
+ */
+class SaveLogs implements SaveLogsInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param DateTime $dateTime
+     */
+    public function __construct(ResourceConnection $resourceConnection, DateTime $dateTime)
+    {
+        $this->resourceConnection = $resourceConnection;
+        $this->dateTime = $dateTime;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(array $logs): void
+    {
+        $logsData = [];
+        foreach ($logs as $log) {
+            if (!$log->getTime()) {
+                $log->setTime($this->dateTime->gmtDate());
+            }
+            $logsData[] = $log->getData();
+        }
+        $logTable = $this->resourceConnection->getTableName(Log::TABLE_NAME_LOG);
+        $connection = $this->resourceConnection->getConnection();
+        $connection->insertOnDuplicate($logTable, $logsData);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php b/app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php
new file mode 100644
index 0000000000000..f72e46bd53a6d
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerLog\Plugin\LoginAsCustomerApi\Api\AuthenticateCustomerInterface;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerInterface;
+use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
+use Magento\LoginAsCustomerLog\Api\Data\LogInterfaceFactory;
+use Magento\LoginAsCustomerLog\Api\SaveLogsInterface;
+use Magento\User\Api\Data\UserInterfaceFactory;
+
+/**
+ * Log user logged in as customer plugin.
+ */
+class LogAuthenticationPlugin
+{
+    /**
+     * @var LogInterfaceFactory
+     */
+    private $logFactory;
+
+    /**
+     * @var SaveLogsInterface
+     */
+    private $saveLogs;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var UserInterfaceFactory
+     */
+    private $userFactory;
+
+    /**
+     * @param LogInterfaceFactory $logFactory
+     * @param SaveLogsInterface $saveLogs
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param UserInterfaceFactory $userFactory
+     */
+    public function __construct(
+        LogInterfaceFactory $logFactory,
+        SaveLogsInterface $saveLogs,
+        CustomerRepositoryInterface $customerRepository,
+        UserInterfaceFactory $userFactory
+    ) {
+        $this->logFactory = $logFactory;
+        $this->saveLogs = $saveLogs;
+        $this->customerRepository = $customerRepository;
+        $this->userFactory = $userFactory;
+    }
+
+    /**
+     * Log user authentication as customer.
+     *
+     * @param AuthenticateCustomerInterface $subject
+     * @param void $result
+     * @param AuthenticationDataInterface $data
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(
+        AuthenticateCustomerInterface $subject,
+        $result,
+        AuthenticationDataInterface $data
+    ): void {
+        $customerId = $data->getCustomerId();
+        $customerEmail = $this->customerRepository->getById($customerId)->getEmail();
+        $userId = $data->getAdminId();
+        $userName = $this->userFactory->create()->load($userId)->getUserName();
+        $log = $this->logFactory->create();
+        $log->setCustomerId($customerId);
+        $log->setUserId($userId);
+        $log->setCustomerEmail($customerEmail);
+        $log->setUserName($userName);
+        $this->saveLogs->execute([$log]);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml b/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
index 9d72b3fa26128..056b5f705d0cf 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
+++ b/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
@@ -8,21 +8,13 @@
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="magento_login_as_customer_log" resource="default" engine="innodb" comment="Login as Customer Logging">
         <column xsi:type="int" name="log_id" padding="11" unsigned="false" nullable="false" identity="true" comment="Log Id"/>
-        <column xsi:type="bigint" name="ip" padding="20" unsigned="false" nullable="false" identity="false" default="0" comment="Ip address"/>
-        <column xsi:type="bigint" name="x_forwarded_ip" padding="20" unsigned="false" nullable="false" identity="false" default="0" comment="Real ip address if visitor used proxy"/>
-        <column xsi:type="varchar" name="event_code" nullable="true" length="100" comment="Event Code"/>
-        <column xsi:type="timestamp" name="time" on_update="false" nullable="true" comment="Even date"/>
-        <column xsi:type="varchar" name="action" nullable="true" length="20" comment="Event action"/>
-        <column xsi:type="text" name="info" nullable="true"/>
-        <column xsi:type="varchar" name="status" nullable="true" length="15" comment="Status"/>
-        <column xsi:type="varchar" name="user" nullable="true" length="40" comment="User name"/>
+        <column xsi:type="timestamp" name="time" on_update="false" nullable="true" comment="Event Date"/>
         <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false" comment="User Id"/>
+        <column xsi:type="varchar" name="user_name" nullable="true" length="40" comment="User Name"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false" comment="Customer Id"/>
-        <column xsi:type="varchar" name="fullaction" nullable="true" length="200" comment="Full action description"/>
-        <column xsi:type="text" name="error_message" nullable="true" comment="Error Message"/>
+        <column xsi:type="varchar" name="customer_email" nullable="true" length="40" comment="Customer email"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="log_id"/>
         </constraint>
-        <constraint xsi:type="foreign" referenceId="MAGENTO_LOGIN_AS_CUSTOMER_LOG_USER_ID_ADMIN_USER_USER_ID" table="magento_login_as_customer_log" column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="SET NULL"/>
     </table>
 </schema>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json b/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
index ca53da9475b2c..472f2114169f4 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
+++ b/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
@@ -2,22 +2,13 @@
     "magento_login_as_customer_log": {
         "column": {
             "log_id": true,
-            "ip": true,
-            "x_forwarded_ip": true,
-            "event_code": true,
-            "time": true,
-            "action": true,
-            "info": true,
-            "status": true,
-            "user": true,
+            "user_name": true,
             "user_id": true,
             "customer_id": true,
-            "fullaction": true,
-            "error_message": true
+            "customer_email": true
         },
         "constraint": {
-            "PRIMARY": true,
-            "MAGENTO_LOGIN_AS_CUSTOMER_LOG_USER_ID_ADMIN_USER_USER_ID": true
+            "PRIMARY": true
         }
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/di.xml b/app/code/Magento/LoginAsCustomerLog/etc/di.xml
index 4c90d5c417ebb..49d19d85f0d65 100755
--- a/app/code/Magento/LoginAsCustomerLog/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomerLog/etc/di.xml
@@ -9,4 +9,5 @@
     <preference for="Magento\LoginAsCustomerLog\Api\Data\LogInterface" type="Magento\LoginAsCustomerLog\Model\Log"/>
     <preference for="Magento\LoginAsCustomerLog\Api\Data\LogSearchResultsInterface" type="Magento\LoginAsCustomerLog\Model\LogSearchResults"/>
     <preference for="Magento\LoginAsCustomerLog\Api\GetLogsListInterface" type="Magento\LoginAsCustomerLog\Model\GetLogList"/>
+    <preference for="Magento\LoginAsCustomerLog\Api\SaveLogsInterface" type="Magento\LoginAsCustomerLog\Model\ResourceModel\SaveLogs"/>
 </config>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerLog/etc/frontend/di.xml
new file mode 100755
index 0000000000000..e370839eef4b6
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerLog/etc/frontend/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">
+    <type name="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerInterface">
+        <plugin name="log_authentication_plugin" type="Magento\LoginAsCustomerLog\Plugin\LoginAsCustomerApi\Api\AuthenticateCustomerInterface\LogAuthenticationPlugin"/>
+    </type>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
index 21762e11081b4..1a53b235c9dc6 100644
--- a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
+++ b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
@@ -28,7 +28,7 @@
         <dataProvider class="Magento\LoginAsCustomerLog\Ui\DataProvider\LogDataProvider" name="login_as_customer_log_listing_data_source">
             <settings>
                 <requestFieldName>log_id</requestFieldName>
-                <primaryFieldName>log_id</primaryFieldName>
+                <primaryFieldName>Id</primaryFieldName>
             </settings>
         </dataProvider>
     </dataSource>
@@ -54,15 +54,40 @@
         <paging name="listing_paging"/>
     </listingToolbar>
     <columns name="login_as_customer_log_listing_columns">
-        <column name="username" sortOrder="10">
+        <column name="log_id" sortOrder="10">
             <settings>
                 <filter>text</filter>
-                <label translate="true">User Name</label>
-                <editor>
-                    <validation>
-                        <rule name="required-entry" xsi:type="boolean">true</rule>
-                    </validation>
-                </editor>
+                <label translate="true">ID</label>
+            </settings>
+        </column>
+        <column name="customer_id" sortOrder="20">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Customer ID</label>
+            </settings>
+        </column>
+        <column name="customer_email" sortOrder="30">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Customer Email</label>
+            </settings>
+        </column>
+        <column name="user_id" sortOrder="40">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Admin ID</label>
+            </settings>
+        </column>
+        <column name="user_name" sortOrder="50">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Admin Name</label>
+            </settings>
+        </column>
+        <column name="time" sortOrder="60">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Logged In</label>
             </settings>
         </column>
     </columns>

From 6d7e97db01993dd9c1c77f550254d32f0009efc0 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 29 Apr 2020 14:39:15 +0300
Subject: [PATCH 3/4] LAC-27: Log admin actions with Login as Customer.

---
 .../Controller/Adminhtml/Log/Index.php        |  2 +-
 .../LoginAsCustomerLog/Model/GetLogList.php   |  7 ++--
 .../Model/ResourceModel/SaveLogs.php          |  2 +-
 .../LogAuthenticationPlugin.php               | 29 +++++++++++++----
 .../Ui/DataProvider/LogDataProvider.php       | 32 ++++++++++++++-----
 .../Magento/LoginAsCustomerLog/composer.json  |  6 +++-
 .../Magento/LoginAsCustomerLog/etc/acl.xml    |  2 +-
 .../LoginAsCustomerLog/etc/adminhtml/menu.xml |  2 +-
 .../LoginAsCustomerLog/etc/db_schema.xml      |  3 ++
 .../etc/db_schema_whitelist.json              |  3 ++
 .../login_as_customer_log_listing.xml         |  2 +-
 11 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php b/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php
index 4911a06b5eff6..ce0c50bf347fc 100644
--- a/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php
+++ b/app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Log/Index.php
@@ -17,7 +17,7 @@
  */
 class Index extends Action implements HttpGetActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login_log';
+    const ADMIN_RESOURCE = 'Magento_LoginAsCustomerLog::login_log';
 
     /**
      * @inheritdoc
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php b/app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php
index e5c7f9a1b9aec..de46b75dab3b9 100644
--- a/app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php
+++ b/app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php
@@ -64,11 +64,8 @@ public function __construct(
     public function execute(SearchCriteriaInterface $searchCriteria = null): LogSearchResultsInterface
     {
         $collection = $this->logCollectionFactory->create();
-        if (null === $searchCriteria) {
-            $searchCriteria = $this->searchCriteriaBuilder->create();
-        } else {
-            $this->collectionProcessor->process($searchCriteria, $collection);
-        }
+        $searchCriteria = $searchCriteria ?: $this->searchCriteriaBuilder->create();
+        $this->collectionProcessor->process($searchCriteria, $collection);
 
         $searchResult = $this->logSearchResultsFactory->create();
         $searchResult->setItems($collection->getItems());
diff --git a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php
index 42fb45ad738c8..f793f75e678cc 100644
--- a/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php
+++ b/app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/SaveLogs.php
@@ -50,6 +50,6 @@ public function execute(array $logs): void
         }
         $logTable = $this->resourceConnection->getTableName(Log::TABLE_NAME_LOG);
         $connection = $this->resourceConnection->getConnection();
-        $connection->insertOnDuplicate($logTable, $logsData);
+        $connection->insertMultiple($logTable, $logsData);
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php b/app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php
index f72e46bd53a6d..c1d999b552821 100644
--- a/app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php
+++ b/app/code/Magento/LoginAsCustomerLog/Plugin/LoginAsCustomerApi/Api/AuthenticateCustomerInterface/LogAuthenticationPlugin.php
@@ -13,6 +13,7 @@
 use Magento\LoginAsCustomerLog\Api\Data\LogInterfaceFactory;
 use Magento\LoginAsCustomerLog\Api\SaveLogsInterface;
 use Magento\User\Api\Data\UserInterfaceFactory;
+use Magento\User\Model\ResourceModel\User;
 
 /**
  * Log user logged in as customer plugin.
@@ -39,22 +40,30 @@ class LogAuthenticationPlugin
      */
     private $userFactory;
 
+    /**
+     * @var User
+     */
+    private $userResource;
+
     /**
      * @param LogInterfaceFactory $logFactory
      * @param SaveLogsInterface $saveLogs
      * @param CustomerRepositoryInterface $customerRepository
      * @param UserInterfaceFactory $userFactory
+     * @param User $userResource
      */
     public function __construct(
         LogInterfaceFactory $logFactory,
         SaveLogsInterface $saveLogs,
         CustomerRepositoryInterface $customerRepository,
-        UserInterfaceFactory $userFactory
+        UserInterfaceFactory $userFactory,
+        User $userResource
     ) {
         $this->logFactory = $logFactory;
         $this->saveLogs = $saveLogs;
         $this->customerRepository = $customerRepository;
         $this->userFactory = $userFactory;
+        $this->userResource = $userResource;
     }
 
     /**
@@ -74,12 +83,18 @@ public function afterExecute(
         $customerId = $data->getCustomerId();
         $customerEmail = $this->customerRepository->getById($customerId)->getEmail();
         $userId = $data->getAdminId();
-        $userName = $this->userFactory->create()->load($userId)->getUserName();
-        $log = $this->logFactory->create();
-        $log->setCustomerId($customerId);
-        $log->setUserId($userId);
-        $log->setCustomerEmail($customerEmail);
-        $log->setUserName($userName);
+        $user = $this->userFactory->create();
+        $this->userResource->load($user, $userId);
+        $log = $this->logFactory->create(
+            [
+                'data' => [
+                    'customer_id' => $customerId,
+                    'user_id' => $userId,
+                    'customer_email' => $customerEmail,
+                    'user_name' => $user->getUserName(),
+                ],
+            ]
+        );
         $this->saveLogs->execute([$log]);
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php b/app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php
index 41a052f283fbd..53a76b08432d9 100644
--- a/app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php
+++ b/app/code/Magento/LoginAsCustomerLog/Ui/DataProvider/LogDataProvider.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\ReportingInterface;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider;
 use Magento\LoginAsCustomerLog\Api\Data\LogInterface;
@@ -24,7 +25,7 @@ class LogDataProvider extends DataProvider
     /**
      * @var GetLogsListInterface
      */
-    private $logRepository;
+    private $getLogsList;
 
     /**
      * @var SearchResultFactory
@@ -32,17 +33,24 @@ class LogDataProvider extends DataProvider
     private $searchResultFactory;
 
     /**
-     * @param $name
-     * @param $primaryFieldName
-     * @param $requestFieldName
+     * @var SortOrderBuilder
+     */
+    private $sortOrderBuilder;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
      * @param ReportingInterface $reporting
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param RequestInterface $request
      * @param FilterBuilder $filterBuilder
-     * @param GetLogsListInterface $logRepository
+     * @param GetLogsListInterface $getLogsList
      * @param SearchResultFactory $searchResultFactory
+     * @param SortOrderBuilder $sortOrderBuilder
      * @param array $meta
      * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         $name,
@@ -52,8 +60,9 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         RequestInterface $request,
         FilterBuilder $filterBuilder,
-        GetLogsListInterface $logRepository,
+        GetLogsListInterface $getLogsList,
         SearchResultFactory $searchResultFactory,
+        SortOrderBuilder $sortOrderBuilder,
         array $meta = [],
         array $data = []
     ) {
@@ -68,8 +77,9 @@ public function __construct(
             $meta,
             $data
         );
-        $this->logRepository = $logRepository;
+        $this->getLogsList = $getLogsList;
         $this->searchResultFactory = $searchResultFactory;
+        $this->sortOrderBuilder = $sortOrderBuilder;
     }
 
     /**
@@ -78,7 +88,13 @@ public function __construct(
     public function getSearchResult()
     {
         $searchCriteria = $this->getSearchCriteria();
-        $result = $this->logRepository->execute($searchCriteria);
+        $sortOrders = $searchCriteria->getSortOrders();
+        $sortOrder = current($sortOrders);
+        if (!$sortOrder->getField()) {
+            $sortOrder = $this->sortOrderBuilder->setDescendingDirection()->setField(LogInterface::TIME)->create();
+            $searchCriteria->setSortOrders([$sortOrder]);
+        }
+        $result = $this->getLogsList->execute($searchCriteria);
 
         return $this->searchResultFactory->create(
             $result->getItems(),
diff --git a/app/code/Magento/LoginAsCustomerLog/composer.json b/app/code/Magento/LoginAsCustomerLog/composer.json
index 7ad41ee1aecee..3ee07ca7565a0 100644
--- a/app/code/Magento/LoginAsCustomerLog/composer.json
+++ b/app/code/Magento/LoginAsCustomerLog/composer.json
@@ -4,7 +4,11 @@
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
-        "magento/module-backend": "*"
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-ui": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
         "magento/module-login-as-customer": "*"
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/acl.xml b/app/code/Magento/LoginAsCustomerLog/etc/acl.xml
index aaf4eb009368e..0a46616b4ad7b 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/acl.xml
+++ b/app/code/Magento/LoginAsCustomerLog/etc/acl.xml
@@ -11,7 +11,7 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Customer::customer">
                     <resource id="Magento_LoginAsCustomer::login" title="Login as Customer" sortOrder="50">
-                        <resource id="Magento_LoginAsCustomer::login_log" title="View Login as Customer Log" sortOrder="20"/>
+                        <resource id="Magento_LoginAsCustomerLog::login_log" title="View Login as Customer Log" sortOrder="20"/>
                     </resource>
                 </resource>
             </resource>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml b/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml
index e44b41b9b8a6a..143e0ad4b5a6c 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml
+++ b/app/code/Magento/LoginAsCustomerLog/etc/adminhtml/menu.xml
@@ -13,7 +13,7 @@
              module="Magento_LoginAsCustomerLog"
              parent="Magento_Customer::customer"
              sortOrder="40"
-             resource="Magento_LoginAsCustomer::login_log"
+             resource="Magento_LoginAsCustomerLog::login_log"
              action="loginascustomer_log/log/index"/>
     </menu>
 </config>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml b/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
index 056b5f705d0cf..a1f40b4e5bbf5 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
+++ b/app/code/Magento/LoginAsCustomerLog/etc/db_schema.xml
@@ -16,5 +16,8 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="log_id"/>
         </constraint>
+        <index referenceId="MAGENTO_LOGIN_AS_CUSTOMER_LOG_USER_ID" indexType="btree">
+            <column name="user_id"/>
+        </index>
     </table>
 </schema>
diff --git a/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json b/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
index 472f2114169f4..6523a283edd0f 100644
--- a/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
+++ b/app/code/Magento/LoginAsCustomerLog/etc/db_schema_whitelist.json
@@ -9,6 +9,9 @@
         },
         "constraint": {
             "PRIMARY": true
+        },
+        "index": {
+            "MAGENTO_LOGIN_AS_CUSTOMER_LOG_USER_ID": true
         }
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
index 1a53b235c9dc6..077fd6e18db7c 100644
--- a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
+++ b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
@@ -24,7 +24,7 @@
             </storageConfig>
             <updateUrl path="mui/index/render"/>
         </settings>
-        <aclResource>Magento_LoginAsCustomer::login_log</aclResource>
+        <aclResource>Magento_LoginAsCustomerLog::login_log</aclResource>
         <dataProvider class="Magento\LoginAsCustomerLog\Ui\DataProvider\LogDataProvider" name="login_as_customer_log_listing_data_source">
             <settings>
                 <requestFieldName>log_id</requestFieldName>

From 72c0773437a69c901082301d290a57ad85d643af Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 30 Apr 2020 16:17:15 +0300
Subject: [PATCH 4/4] LAC-27: Log admin actions with Login as Customer.

---
 app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php   | 2 ++
 .../LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php   | 2 ++
 .../Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php     | 2 ++
 app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
index 587745b6e7ecc..10d793d6c4c0b 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
@@ -11,6 +11,8 @@
 
 /**
  * Data interface for login as customer log.
+ *
+ * @api
  */
 interface LogInterface extends ExtensibleDataInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
index 58c28f55a4b1b..5b08d28af6335 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
@@ -11,6 +11,8 @@
 
 /**
  * Login as customer log entity search results interface.
+ *
+ * @api
  */
 interface LogSearchResultsInterface extends SearchResultsInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
index 9face90f18fc9..4b5ee382c908a 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
@@ -12,6 +12,8 @@
 
 /**
  * Get login as customer log list considering search criteria.
+ *
+ * @api
  */
 interface GetLogsListInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
index 7ca95263aedfb..67e1ece477727 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
@@ -9,6 +9,8 @@
 
 /**
  * Save login as custom logs entities.
+ *
+ * @api
  */
 interface SaveLogsInterface
 {