Merge remote-tracking branch 'mainline/2.4-develop' into ACP2E-926

Author: o-dubovyk

app/bootstrap.php

@@ -27,6 +27,7 @@
 </div>
 HTML;
     }
+    http_response_code(503);
     exit(1);
 }
 

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Api\Data;

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiSearchResultsInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Api\Data;

app/code/Magento/AdminAdobeIms/Api/ImsLogOutInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Api;

app/code/Magento/AdminAdobeIms/Api/ImsWebapiRepositoryInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\App\Action\Plugin;

app/code/Magento/AdminAdobeIms/App/Action/Plugin/Authentication.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Block\Adminhtml\System\Config\Form\Field;

app/code/Magento/AdminAdobeIms/Block/Adminhtml/System/Config/Form/Field/Disabled.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsDisableCommand.php

@@ -3,17 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;
 
-use Magento\AdminAdobeIms\Model\ImsConnection;
-use Magento\AdminAdobeIms\Service\UpdateTokensService;
 use Magento\AdminAdobeIms\Service\ImsCommandOptionService;
 use Magento\AdminAdobeIms\Service\ImsConfig;
+use Magento\AdminAdobeIms\Service\UpdateTokensService;
+use Magento\AdobeImsApi\Api\AuthorizationInterface;
+use Magento\Authorization\Model\Acl\Role\Group;
+use Magento\Authorization\Model\ResourceModel\Role\CollectionFactory;
+use Magento\Authorization\Model\Role;
+use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\App\Cache\Type\Config;
 use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\InvalidArgumentException;
 use Magento\Framework\Exception\LocalizedException;
@@ -53,11 +57,6 @@ class AdminAdobeImsEnableCommand extends Command
      */
     private ImsConfig $adminImsConfig;
 
-    /**
-     * @var ImsConnection
-     */
-    private ImsConnection $adminImsConnection;
-
     /**
      * @var ImsCommandOptionService
      */
@@ -73,26 +72,47 @@ class AdminAdobeImsEnableCommand extends Command
      */
     private UpdateTokensService $updateTokensService;
 
+    /**
+     * @var Role
+     */
+    private Role $role;
+
+    /**
+     * @var CollectionFactory
+     */
+    private CollectionFactory $roleCollection;
+
+    /**
+     * @var AuthorizationInterface
+     */
+    private AuthorizationInterface $authorization;
+
     /**
      * @param ImsConfig $adminImsConfig
-     * @param ImsConnection $adminImsConnection
      * @param ImsCommandOptionService $imsCommandOptionService
      * @param TypeListInterface $cacheTypeList
      * @param UpdateTokensService $updateTokensService
+     * @param AuthorizationInterface $authorization
+     * @param Role|null $role
+     * @param CollectionFactory|null $roleCollection
      */
     public function __construct(
         ImsConfig $adminImsConfig,
-        ImsConnection $adminImsConnection,
         ImsCommandOptionService $imsCommandOptionService,
         TypeListInterface $cacheTypeList,
-        UpdateTokensService $updateTokensService
+        UpdateTokensService $updateTokensService,
+        AuthorizationInterface $authorization,
+        Role $role = null,
+        CollectionFactory $roleCollection = null
     ) {
         parent::__construct();
         $this->adminImsConfig = $adminImsConfig;
-        $this->adminImsConnection = $adminImsConnection;
         $this->imsCommandOptionService = $imsCommandOptionService;
         $this->cacheTypeList = $cacheTypeList;
         $this->updateTokensService = $updateTokensService;
+        $this->authorization = $authorization;
+        $this->role = $role ?: ObjectManager::getInstance()->get(Role::class);
+        $this->roleCollection = $roleCollection ?: ObjectManager::getInstance()->get(CollectionFactory::class);
 
         $this->setName('admin:adobe-ims:enable')
             ->setDescription('Enable Adobe IMS Module.')
@@ -164,6 +184,7 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
             if ($clientId && $clientSecret && $organizationId && $isTwoFactorAuthEnabled) {
                 $enabled = $this->enableModule($clientId, $clientSecret, $organizationId, $isTwoFactorAuthEnabled);
                 if ($enabled) {
+                    $this->saveImsAuthorizationRole();
                     $output->writeln(__('Admin Adobe IMS integration is enabled'));
                     return Cli::RETURN_SUCCESS;
                 }
@@ -182,6 +203,27 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
         }
     }
 
+    /**
+     * Save new Adobe IMS role
+     *
+     * @return bool
+     * @throws \Exception
+     */
+    private function saveImsAuthorizationRole(): bool
+    {
+        $roleCollection = $this->roleCollection->create()->addFieldToFilter('role_name', 'Adobe Ims');
+        if (!$roleCollection->getSize()) {
+            $this->role->setRoleName('Adobe Ims')
+                ->setUserType((string)UserContextInterface::USER_TYPE_ADMIN)
+                ->setUserId(0)
+                ->setRoleType(Group::ROLE_TYPE)
+                ->setParentId(0)
+                ->save();
+        }
+
+        return true;
+    }
+
     /**
      * Enable Admin Adobe IMS Module when testConnection was successfully
      *
@@ -199,7 +241,7 @@ private function enableModule(
         string $organizationId,
         bool $isTwoFactorAuthEnabled
     ): bool {
-        $testAuth = $this->adminImsConnection->testAuth($clientId);
+        $testAuth = $this->authorization->testAuth($clientId);
         if ($testAuth) {
             $this->adminImsConfig->enableModule($clientId, $clientSecret, $organizationId, $isTwoFactorAuthEnabled);
             $this->cacheTypeList->cleanType(Config::TYPE_IDENTIFIER);

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsEnableCommand.php

@@ -3,13 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;
 
-use Magento\AdminAdobeIms\Model\ImsConnection;
 use Magento\AdminAdobeIms\Service\ImsConfig;
+use Magento\AdobeImsApi\Api\AuthorizationInterface;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -41,21 +40,21 @@ class AdminAdobeImsInfoCommand extends Command
     private ImsConfig $adminImsConfig;
 
     /**
-     * @var ImsConnection
+     * @var AuthorizationInterface
      */
-    private ImsConnection $adminImsConnection;
+    private AuthorizationInterface $authorization;
 
     /**
      * @param ImsConfig $adminImsConfig
-     * @param ImsConnection $adminImsConnection
+     * @param AuthorizationInterface $authorization
      */
     public function __construct(
         ImsConfig $adminImsConfig,
-        ImsConnection $adminImsConnection
+        AuthorizationInterface $authorization
     ) {
         parent::__construct();
         $this->adminImsConfig = $adminImsConfig;
-        $this->adminImsConnection = $adminImsConnection;
+        $this->authorization = $authorization;
 
         $this->setName('admin:adobe-ims:info')
             ->setDescription('Information of Adobe IMS Module configuration');
@@ -69,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
         try {
             if ($this->adminImsConfig->enabled()) {
                 $clientId = $this->adminImsConfig->getApiKey();
-                if ($this->adminImsConnection->testAuth($clientId)) {
+                if ($this->authorization->testAuth($clientId)) {
                     $clientSecret = $this->adminImsConfig->getPrivateKey() ? 'configured' : 'not configured';
                     $output->writeln(self::CLIENT_ID_NAME . ': ' . $clientId);
                     $output->writeln(self::ORGANIZATION_ID_NAME . ': ' . $this->adminImsConfig->getOrganizationId());