Merge branch '2.4-develop' into 2.4-develop

Author: Dhaval410

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

@@ -35,7 +35,7 @@
         <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="clickFoundUsername"/>
         <waitForPageLoad time="30" stepKey="wait2"/>
         <seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$" stepKey="seeUsernameInField"/>
-        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
 
         <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>

app/code/Magento/AsyncConfig/Test/Mftf/Suite/AsyncOperationsSuite.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
+    <suite name="AsyncOperationsSuite">
+        <include>
+            <group name="async_operations"/>
+        </include>
+    </suite>
+</suites>

app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

@@ -16,6 +16,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="ACPT-885"/>
             <group value="configuration"/>
+            <group value="async_operations" />
         </annotations>
         <before>
             <!--Enable Async Configuration-->

app/code/Magento/AsynchronousOperations/Model/AccessValidator.php

@@ -6,13 +6,13 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-/**
- * Class AccessValidator
- */
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Authorization\Model\UserContextInterface;
+
 class AccessValidator
 {
     /**
-     * @var \Magento\Authorization\Model\UserContextInterface
+     * @var UserContextInterface
      */
     private $userContext;
 
@@ -27,13 +27,12 @@ class AccessValidator
     private $bulkSummaryFactory;
 
     /**
-     * AccessValidator constructor.
-     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param UserContextInterface $userContext
      * @param \Magento\Framework\EntityManager\EntityManager $entityManager
      * @param \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory $bulkSummaryFactory
      */
     public function __construct(
-        \Magento\Authorization\Model\UserContextInterface $userContext,
+        UserContextInterface $userContext,
         \Magento\Framework\EntityManager\EntityManager $entityManager,
         \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory $bulkSummaryFactory
     ) {
@@ -50,11 +49,15 @@ public function __construct(
      */
     public function isAllowed($bulkUuid)
     {
-        /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulkSummary */
+        /** @var BulkSummaryInterface $bulkSummary */
         $bulkSummary = $this->entityManager->load(
             $this->bulkSummaryFactory->create(),
             $bulkUuid
         );
+        if ((int) $bulkSummary->getUserType() === UserContextInterface::USER_TYPE_INTEGRATION) {
+            return true;
+        }
+
         return ((int) $bulkSummary->getUserId()) === ((int) $this->userContext->getUserId());
     }
 }

app/code/Magento/AsynchronousOperations/Model/BulkStatus/Options.php

@@ -7,32 +7,29 @@
 
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
 
-/**
- * Class Options
- */
 class Options implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
-     * @return array
+     * @inheritDoc
      */
     public function toOptionArray()
     {
         return [
             [
                 'value' => BulkSummaryInterface::NOT_STARTED,
-                'label' => 'Not Started'
+                'label' => __('Not Started')
             ],
             [
                 'value' => BulkSummaryInterface::IN_PROGRESS,
-                'label' => 'In Progress'
+                'label' => __('In Progress')
             ],
             [
                 'value' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
-                'label' => 'Finished Successfully'
+                'label' => __('Finished Successfully')
             ],
             [
                 'value' => BulkSummaryInterface::FINISHED_WITH_FAILURE,
-                'label' => 'Finished with Failure'
+                'label' => __('Finished with Failure')
             ]
         ];
     }

app/code/Magento/AsynchronousOperations/Model/BulkUserType/Options.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model\BulkUserType;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Data\OptionSourceInterface;
+
+class Options implements OptionSourceInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            [
+                'value' => UserContextInterface::USER_TYPE_ADMIN,
+                'label' => __('Admin user')
+            ],
+            [
+                'value' => UserContextInterface::USER_TYPE_INTEGRATION,
+                'label' => __('Integration')
+            ]
+        ];
+    }
+}

app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php

@@ -8,15 +8,13 @@
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
 use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
 use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Bulk\BulkSummaryInterface;
 use Magento\AsynchronousOperations\Model\StatusMapper;
 use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
 
-/**
- * Class SearchResult
- */
 class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
 {
     /**
@@ -40,7 +38,6 @@ class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvi
     private $calculatedStatusSql;
 
     /**
-     * SearchResult constructor.
      * @param EntityFactory $entityFactory
      * @param Logger $logger
      * @param FetchStrategy $fetchStrategy
@@ -49,7 +46,7 @@ class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvi
      * @param StatusMapper $statusMapper
      * @param CalculatedStatusSql $calculatedStatusSql
      * @param string $mainTable
-     * @param null $resourceModel
+     * @param AbstractResource $resourceModel
      * @param string $identifierName
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -80,7 +77,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _initSelect()
     {
@@ -93,12 +90,18 @@ protected function _initSelect()
         )->where(
             'user_id=?',
             $this->userContext->getUserId()
+        )->where(
+            'user_type=?',
+            UserContextInterface::USER_TYPE_ADMIN
+        )->orWhere(
+            'user_type=?',
+            UserContextInterface::USER_TYPE_INTEGRATION
         );
         return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _afterLoad()
     {
@@ -110,7 +113,7 @@ protected function _afterLoad()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addFieldToFilter($field, $condition = null)
     {
@@ -133,7 +136,7 @@ public function addFieldToFilter($field, $condition = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSelectCountSql()
     {

app/code/Magento/AsynchronousOperations/i18n/en_US.csv

@@ -33,3 +33,10 @@ Error,Error
 "Dismiss All Completed Tasks","Dismiss All Completed Tasks"
 "Action Details - #","Action Details - #"
 "Number of Records Affected","Number of Records Affected"
+"User Type","User Type"
+"Admin user","Admin user"
+"Integration","Integration"
+"Not Started","Not Started"
+"In Progress","In Progress"
+"Finished Successfully","Finished Successfully"
+"Finished with Failure","Finished with Failure"

app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml

@@ -81,6 +81,14 @@
                 <label translate="true">Description of Operation</label>
             </settings>
         </column>
+        <column name="user_type" component="Magento_Ui/js/grid/columns/select" sortOrder="55">
+            <settings>
+                <filter>select</filter>
+                <options class="\Magento\AsynchronousOperations\Model\BulkUserType\Options"/>
+                <dataType>select</dataType>
+                <label translate="true">User Type</label>
+            </settings>
+        </column>
         <column name="status" component="Magento_Ui/js/grid/columns/select" sortOrder="60">
             <settings>
                 <filter>select</filter>

app/code/Magento/Authorization/Model/IdentityProvider.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Authorization\Model;
+
+use Magento\Framework\App\Backpressure\ContextInterface;
+use Magento\Framework\App\Backpressure\IdentityProviderInterface;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+
+/**
+ * Utilizes UserContext for backpressure identity
+ */
+class IdentityProvider implements IdentityProviderInterface
+{
+    /**
+     * User context identity type map
+     */
+    private const USER_CONTEXT_IDENTITY_TYPE_MAP = [
+        UserContextInterface::USER_TYPE_CUSTOMER => ContextInterface::IDENTITY_TYPE_CUSTOMER,
+        UserContextInterface::USER_TYPE_ADMIN => ContextInterface::IDENTITY_TYPE_ADMIN
+    ];
+
+    /**
+     * @var UserContextInterface
+     */
+    private UserContextInterface $userContext;
+
+    /**
+     * @var RemoteAddress
+     */
+    private RemoteAddress $remoteAddress;
+
+    /**
+     * @param UserContextInterface $userContext
+     * @param RemoteAddress $remoteAddress
+     */
+    public function __construct(UserContextInterface $userContext, RemoteAddress $remoteAddress)
+    {
+        $this->userContext = $userContext;
+        $this->remoteAddress = $remoteAddress;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @throws RuntimeException
+     */
+    public function fetchIdentityType(): int
+    {
+        if (!$this->userContext->getUserId()) {
+            return ContextInterface::IDENTITY_TYPE_IP;
+        }
+
+        $userType = $this->userContext->getUserType();
+        if (isset(self::USER_CONTEXT_IDENTITY_TYPE_MAP[$userType])) {
+            return self::USER_CONTEXT_IDENTITY_TYPE_MAP[$userType];
+        }
+
+        throw new RuntimeException(__('User type not defined'));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @throws RuntimeException
+     */
+    public function fetchIdentity(): string
+    {
+        $userId = $this->userContext->getUserId();
+        if ($userId) {
+            return (string)$userId;
+        }
+
+        $address = $this->remoteAddress->getRemoteAddress();
+        if (!$address) {
+            throw new RuntimeException(__('Failed to extract remote address'));
+        }
+
+        return $address;
+    }
+}