Merge branch '2.4-develop' into admin-security/config-scope

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,72 @@
+name: Bug report
+description: Technical issue with the Magento 2 core components
+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: Preconditions and environment
+      description: |
+        Describe your environment.
+        Provide all the details that will help us to reproduce the bug.
+      value: |
+        - Magento version
+        - Anything else that would help a developer reproduce the bug
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Provide a set of clear steps to reproduce this bug.
+      placeholder: |
+        Example:
+          1. Navigate to storefront as a guest.
+          2. Open Test Category.
+          3. Click “Add to Cart” on the Virtual Product.
+          4. Open mini shopping cart and click “Proceed to Checkout”.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected result
+      description: |
+        Tell us what you expected to happen.
+      placeholder: |
+        Example:
+          Order is placed successfully, customer is redirected to the success page.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual result
+      description: |
+        Tell us what happened. Include error messages and issues.
+      placeholder: |
+        Example:
+          “Place order” button is not visible, order cannot be placed.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        Additional information is often requested when the bug report is processed. You can save time by providing both Magento and browser logs, screenshots, repository branch and HEAD commit you checked out to install Magento and any other artifacts related to the issue.
+        Also, links to the comments with important information, Root Cause analysis, additional video recordings; and anything else that is important for the issue and at some reason cannot be added to other sections.
+  - 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”._'

SECURITY.md

@@ -4,7 +4,7 @@ Magento values the contributions of the security research community, and we look
 
 ## Where should I report security issues?
 
-We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/magento).  Please provide us with relevant technical details and repro steps to expedite our investigation.  If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.  
+We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/adobe).  Please provide us with relevant technical details and repro steps to expedite our investigation.  If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.  
 
 ## Learning More About Security
 To learn more about securing a Magento store, please visit the [Security Center](https://magento.com/security).

app/code/Magento/AdminAdobeIms/.gitignore

@@ -0,0 +1 @@
+view/adminhtml/web/node_modules/

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

@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AdminAdobeIms\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Declare the ims token data service object
+ * @api
+ */
+interface ImsWebapiInterface extends ExtensibleDataInterface
+{
+    /**
+     * Get ID
+     *
+     * @return int|null
+     */
+    public function getId();
+
+    /**
+     * Get admin user ID
+     *
+     * @return int|null
+     */
+    public function getAdminUserId(): ?int;
+
+    /**
+     * Set admin user ID
+     *
+     * @param int $value
+     * @return $this
+     */
+    public function setAdminUserId(int $value): ImsWebapiInterface;
+
+    /**
+     * Get access token hash
+     *
+     * @return string|null
+     */
+    public function getAccessTokenHash(): ?string;
+
+    /**
+     * Set access token hash
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setAccessTokenHash(string $value): ImsWebapiInterface;
+
+    /**
+     * Get access token
+     *
+     * @return string|null
+     */
+    public function getAccessToken(): ?string;
+
+    /**
+     * Set access token
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setAccessToken(string $value): ImsWebapiInterface;
+
+    /**
+     * Get creation time
+     *
+     * @return string|null
+     */
+    public function getCreatedAt(): ?string;
+
+    /**
+     * Set creation time
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setCreatedAt(string $value): ImsWebapiInterface;
+
+    /**
+     * Get update time
+     *
+     * @return string|null
+     */
+    public function getUpdatedAt(): ?string;
+
+    /**
+     * Set update time
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setUpdatedAt(string $value): ImsWebapiInterface;
+
+    /**
+     * Get last check time
+     *
+     * @return string|null
+     */
+    public function getLastCheckTime(): ?string;
+
+    /**
+     * Set last check time
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setLastCheckTime(string $value): ImsWebapiInterface;
+
+    /**
+     * Get expires time of token
+     *
+     * @return string|null
+     */
+    public function getAccessTokenExpiresAt(): ?string;
+
+    /**
+     * Set expires time of token
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setAccessTokenExpiresAt(string $value): ImsWebapiInterface;
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface|null
+     */
+    public function getExtensionAttributes(): ImsWebapiExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(ImsWebapiExtensionInterface $extensionAttributes): ImsWebapiInterface;
+}

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

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AdminAdobeIms\Api\Data;
+
+use Magento\AdminAdobeIms\Api\Data\ImsWebapiInterface;
+use Magento\Framework\Api\SearchResultsInterface;
+
+/**
+ * Interface ImsWebapiSearchResultsInterface
+ *
+ * @api
+ */
+interface ImsWebapiSearchResultsInterface extends SearchResultsInterface
+{
+    /**
+     * Get ims token list.
+     *
+     * @return ImsWebapiInterface[]
+     */
+    public function getItems();
+
+    /**
+     * Set ims token list.
+     *
+     * @param ImsWebapiInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items);
+}

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

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AdminAdobeIms\Api;
+
+/**
+ * Declare functionality for user logout from the Adobe IMS account
+ *
+ * @api
+ */
+interface ImsLogOutInterface
+{
+    /**
+     * LogOut User from Adobe IMS Account
+     *
+     * @param string|null $accessToken
+     * @return bool
+     */
+    public function execute(?string $accessToken = null) : bool;
+}