Merge remote-tracking branch 'magento/2.4-develop' into no-author/url-user-variable-weee

Author: engcom-Delta

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/AwsS3/Driver/AwsS3Factory.php

@@ -54,28 +54,37 @@ class AwsS3Factory implements DriverFactoryInterface
      */
     private $cachePrefix;
 
+    /**
+     * @var CachedCredentialsProvider
+     */
+    private $cachedCredentialsProvider;
+
     /**
      * @param ObjectManagerInterface $objectManager
      * @param Config $config
      * @param MetadataProviderInterfaceFactory $metadataProviderFactory
      * @param CacheInterfaceFactory $cacheInterfaceFactory
      * @param CachedAdapterInterfaceFactory $cachedAdapterInterfaceFactory
      * @param string|null $cachePrefix
+     * @param CachedCredentialsProvider|null $cachedCredentialsProvider
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
         Config $config,
         MetadataProviderInterfaceFactory $metadataProviderFactory,
         CacheInterfaceFactory $cacheInterfaceFactory,
         CachedAdapterInterfaceFactory $cachedAdapterInterfaceFactory,
-        string $cachePrefix = null
+        string $cachePrefix = null,
+        ?CachedCredentialsProvider $cachedCredentialsProvider = null,
     ) {
         $this->objectManager = $objectManager;
         $this->config = $config;
         $this->metadataProviderFactory = $metadataProviderFactory;
         $this->cacheInterfaceFactory = $cacheInterfaceFactory;
         $this->cachedAdapterInterfaceFactory = $cachedAdapterInterfaceFactory;
         $this->cachePrefix = $cachePrefix;
+        $this->cachedCredentialsProvider = $cachedCredentialsProvider ??
+            $this->objectManager->get(CachedCredentialsProvider::class);
     }
 
     /**
@@ -94,18 +103,19 @@ public function create(): RemoteDriverInterface
     }
 
     /**
-     * @inheritDoc
+     * Prepare config for S3Client
+     *
+     * @param array $config
+     * @return array
+     * @throws DriverException
      */
-    public function createConfigured(
-        array $config,
-        string $prefix,
-        string $cacheAdapter = '',
-        array $cacheConfig = []
-    ): RemoteDriverInterface {
+    private function prepareConfig(array $config)
+    {
         $config['version'] = 'latest';
 
         if (empty($config['credentials']['key']) || empty($config['credentials']['secret'])) {
-            unset($config['credentials']);
+            //Access keys were not provided; request token from AWS config (local or EC2) and cache result
+            $config['credentials'] = $this->cachedCredentialsProvider->get();
         }
 
         if (empty($config['bucket']) || empty($config['region'])) {
@@ -120,6 +130,19 @@ public function createConfigured(
             $config['use_path_style_endpoint'] = boolval($config['path_style']);
         }
 
+        return $config;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createConfigured(
+        array $config,
+        string $prefix,
+        string $cacheAdapter = '',
+        array $cacheConfig = []
+    ): RemoteDriverInterface {
+        $config = $this->prepareConfig($config);
         $client = new S3Client($config);
         $adapter = new AwsS3V3Adapter($client, $config['bucket'], $prefix);
         $cache = $this->cacheInterfaceFactory->create(

app/code/Magento/AwsS3/Driver/CachedCredentialsProvider.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AwsS3\Driver;
+
+use Aws\Credentials\CredentialProvider;
+
+class CachedCredentialsProvider
+{
+    /**
+     * @var CredentialsCache
+     */
+    private $magentoCacheAdapter;
+
+    /**
+     * @param CredentialsCache $magentoCacheAdapter
+     */
+    public function __construct(CredentialsCache $magentoCacheAdapter)
+    {
+        $this->magentoCacheAdapter = $magentoCacheAdapter;
+    }
+
+    /**
+     * Provides cache mechanism to retrieve and store AWS credentials
+     *
+     * @return callable
+     */
+    public function get()
+    {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return call_user_func(
+            [CredentialProvider::class, 'cache'],
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
+            call_user_func([CredentialProvider::class, 'defaultProvider']),
+            $this->magentoCacheAdapter
+        );
+    }
+}