Merge branch '2.4-develop' into fix-for-issue-12075

Author: engcom-Alfa

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -0,0 +1,45 @@
+name: Developer experience issue
+description: Issues related to customization, extensibility, modularity
+labels: ['Triage: Dev.Experience']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
+  - type: textarea
+    attributes:
+      label: Summary
+      description: |
+        Describe the issue you are experiencing.
+        Include general information, error messages, environments, and so on.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Examples
+      description: |
+        Provide code examples or a patch with a test (recommended) to clearly indicate the problem.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed solution
+      description: |
+        Suggest your potential solutions for this issue.
+  - type: textarea
+    attributes:
+      label: Release note
+      description: |
+        Help us to provide meaningful release notes to the community.
+  - type: checkboxes
+    attributes:
+      label: Triage and priority
+      description: |
+        Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
+        This information helps us during the Confirmation and Issue triage processes.
+      options:
+        - label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
+        - label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
+        - label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'

.github/ISSUE_TEMPLATE/developer_experience_issue.yaml

@@ -0,0 +1,41 @@
+name: Feature request
+description: Report to https://github.com/magento/community-features
+labels: ['feature request']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Important: This repository is intended only for Magento 2 Technical Issues.
+        Enter Feature Requests at https://github.com/magento/community-features.
+        Project stakeholders monitor and manage requests.
+        Feature requests entered using this form may be moved to the forum.
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        Describe the feature you would like to add.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: |
+        What is the expected behavior of this feature?
+        How is it going to work?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Benefits
+      description: |
+        How do you think this feature would improve Magento?
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        What other information can you provide about the desired feature?
+  - type: textarea
+    attributes:
+      label: Release note
+      description: |
+        Help us to provide meaningful release notes to the community.

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdminAdobeIms\Api;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+
+/**
+ * Interface SaveImsUserInterface
+ * Save Ims User & Role
+ */
+interface SaveImsUserInterface
+{
+    /**
+     * Add Admin Adobe IMS User with Default Role i.e "Adobe Ims" & No Permissions
+     *
+     * @param array $profile
+     * @return void
+     * @throws CouldNotSaveException
+     */
+    public function save(array $profile): void;
+}

app/bootstrap.php

@@ -11,8 +11,13 @@
 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;
@@ -67,6 +72,16 @@ class AdminAdobeImsEnableCommand extends Command
      */
     private UpdateTokensService $updateTokensService;
 
+    /**
+     * @var Role
+     */
+    private Role $role;
+
+    /**
+     * @var CollectionFactory
+     */
+    private CollectionFactory $roleCollection;
+
     /**
      * @var AuthorizationInterface
      */
@@ -78,20 +93,26 @@ class AdminAdobeImsEnableCommand extends Command
      * @param TypeListInterface $cacheTypeList
      * @param UpdateTokensService $updateTokensService
      * @param AuthorizationInterface $authorization
+     * @param Role|null $role
+     * @param CollectionFactory|null $roleCollection
      */
     public function __construct(
         ImsConfig $adminImsConfig,
         ImsCommandOptionService $imsCommandOptionService,
         TypeListInterface $cacheTypeList,
         UpdateTokensService $updateTokensService,
-        AuthorizationInterface $authorization
+        AuthorizationInterface $authorization,
+        Role $role = null,
+        CollectionFactory $roleCollection = null
     ) {
         parent::__construct();
         $this->adminImsConfig = $adminImsConfig;
         $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.')
@@ -163,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;
                 }
@@ -181,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
      *