LAC-27: Log admin actions with Login as Customer.

Author: nmalevanec

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

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());

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);
     }
 }

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]);
     }
 }

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,25 +25,32 @@ class LogDataProvider extends DataProvider
     /**
      * @var GetLogsListInterface
      */
-    private $logRepository;
+    private $getLogsList;
 
     /**
      * @var SearchResultFactory
      */
     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(),

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": "*"

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>

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>

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>

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
         }
     }
 }