Merge branch '2.4-develop' into graphql-special-price-leak

Author: cpartica

.editorconfig

@@ -16,3 +16,7 @@ indent_size = 2
 
 [{composer, auth}.json]
 indent_size = 4
+
+[db_schema_whitelist.json]
+indent_size = 4
+trim_trailing_whitespace = false

.github/CONTRIBUTING.md

@@ -15,7 +15,7 @@ For more detailed information on contribution please read our [beginners guide](
 
 ## Contribution requirements
 
-1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.3/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.4/coding-standards/bk-coding-standards.html).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.3-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
@@ -33,7 +33,7 @@ This will allow you to collaborate with the Magento 2 development team, fork the
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,7 +34,7 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 2.
 
 ---
-Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+Please provide [Severity](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
 
 - [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
 - [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._

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

@@ -20,7 +20,7 @@ Fields marked with (*) are required. Please don't remove the template.
 <!--- Suggest your potential solutions for this issue. -->
 
 ---
-Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+Please provide [Severity](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
 
 - [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
 - [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._

.github/PULL_REQUEST_TEMPLATE.md

@@ -43,4 +43,5 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)

.github/stale.yml

@@ -39,8 +39,9 @@ staleLabel: "stale issue"
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
-  for your contributions.
+  recent activity. It will be closed after 14 days if no further activity occurs.
+  Is this issue still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
+  Thank you for your contributions!
 # Comment to post when removing the stale label.
 # unmarkComment: >
 #   Your comment here.

README.md

@@ -15,21 +15,24 @@
     </a>
 </p>
 
-## Welcome
+# Welcome
+
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento System Requirements
-[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html).
+
+[Magento System Requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html).
 
 ## Install Magento
 
-*    [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
+* [Installation Guide](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html).
 
 ## Learn More About GraphQL in Magento 2
 
-* [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.3/graphql/index.html)
+* [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.4/graphql/index.html)
+
+## Contributing to the Magento 2 Code Base
 
-<h2>Contributing to the Magento 2 Code Base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
 
 To learn about how to contribute, click [here][1].
@@ -38,27 +41,27 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html
-[2]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report
+[1]: https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html
+[2]: https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#report
 [3]: https://github.com/magento/magento2/issues
 [4]: https://devdocs.magento.com
 
-<h3>Community Maintainers</h3>
+### Community Maintainers
+
 The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks to these Community Maintainers for their valuable contributions.
 
-<a href="https://magento.com/magento-contributors#maintainers">
-    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
-</a>
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://magento.com/magento-contributors#maintainers)
+
+### Top Contributors
 
-<h3>Top Contributors</h3>
 Magento is thankful for any contribution that can improve our codebase, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
-<a href="https://magento.com/magento-contributors">
-    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
-</a>
+
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png)](https://magento.com/magento-contributors)
 
 ### Labels Applied by the Magento Team
+
 We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
-Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
+Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
 
 ## Reporting Security Issues
 
@@ -71,18 +74,17 @@ Stay up-to-date on the latest security news and patches for Magento by signing u
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
 
 [Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
-Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.3-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
+Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.4-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
 
 Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
-Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.
+Please see LICENSE_EE.txt for the full text of the MEE License or visit <https://magento.com/legal/terms/enterprise>.
 
 ## Community Engineering Slack
 
 To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://opensource.magento.com/slack).
 
-
 We have channels for each project. These channels are recommended for new members:
 
-- [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
-- [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
-- [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog
+* [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
+* [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
+* [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog

app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml

@@ -31,5 +31,46 @@
 
         <waitForPageLoad stepKey="waitForPageReloaded"/>
         <seeInPageSource html="var adminAnalyticsMetadata =" stepKey="seeInPageSource"/>
+        <grabPageSource stepKey="pageSource"/>
+        <assertRegExp message="adminAnalyticsMetadata object is invalid" stepKey="validateadminAnalyticsMetadata">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?("[\w_]+":\s+"[^"]*?"\s+)};#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect user ID" stepKey="validateUserId">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"user":\s+"[\w\d]{64}"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect secure base URL" stepKey="validateSecureBaseURL">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"secure_base_url":\s+"http(s)?\\\\u003A\\\\u002F\\\\u002F.+?\\\\u002F"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect product version" stepKey="validateProductVersion">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"version":\s+"[^\s]+"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect product edition" stepKey="validateProductEdition">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"product_edition":\s+"(Community|Enterprise|B2B)"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect application mode" stepKey="validateApplicationMode">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"mode":\s+"default|developer|production"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect store name" stepKey="validateStoreName">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"store_name_default":\s+".*?"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect admin user created date" stepKey="validateAdminUserCreatedDate">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"admin_user_created":\s+".+?"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect admin user log date" stepKey="validateAdminUserLogDate">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"admin_user_logdate":\s+".+?"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object contains incorrect admin user role name" stepKey="validateAdminUserRoleName">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?"admin_user_role_name":\s+".+?"#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
     </test>
 </tests>

app/code/Magento/AdminAnalytics/ViewModel/Metadata.php

@@ -3,12 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\AdminAnalytics\ViewModel;
 
+use Magento\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Framework\App\State;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Store\Model\Information;
 
 /**
  * Gets user version and mode
@@ -30,19 +36,27 @@ class Metadata implements ArgumentInterface
      */
     private $productMetadata;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
     /**
      * @param ProductMetadataInterface $productMetadata
      * @param Session $authSession
      * @param State $appState
+     * @param ScopeConfigInterface $config
      */
     public function __construct(
         ProductMetadataInterface $productMetadata,
         Session $authSession,
-        State $appState
+        State $appState,
+        ScopeConfigInterface $config
     ) {
         $this->productMetadata = $productMetadata;
         $this->authSession = $authSession;
         $this->appState = $appState;
+        $this->config = $config;
     }
 
     /**
@@ -55,15 +69,26 @@ public function getMagentoVersion() :string
         return $this->productMetadata->getVersion();
     }
 
+    /**
+     * Get product edition
+     *
+     * @return string
+     */
+    public function getProductEdition(): string
+    {
+        return $this->productMetadata->getEdition();
+    }
+
     /**
      * Get current user id (hash generated from email)
      *
      * @return string
      */
     public function getCurrentUser() :string
     {
-        return hash('sha512', 'ADMIN_USER' . $this->authSession->getUser()->getEmail());
+        return hash('sha256', 'ADMIN_USER' . $this->authSession->getUser()->getEmail());
     }
+
     /**
      * Get Magento mode that the user is using
      *
@@ -73,4 +98,62 @@ public function getMode() :string
     {
         return $this->appState->getMode();
     }
+
+    /**
+     * Get created date for current user
+     *
+     * @return string
+     */
+    public function getCurrentUserCreatedDate(): string
+    {
+        return $this->authSession->getUser()->getCreated();
+    }
+
+    /**
+     * Get log date for current user
+     *
+     * @return string|null
+     */
+    public function getCurrentUserLogDate(): ?string
+    {
+        return $this->authSession->getUser()->getLogdate();
+    }
+
+    /**
+     * Get secure base URL
+     *
+     * @param string $scope
+     * @param string|null $scopeCode
+     * @return string|null
+     */
+    public function getSecureBaseUrlForScope(
+        string $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+        ?string $scopeCode = null
+    ): ?string {
+        return $this->config->getValue(Custom::XML_PATH_SECURE_BASE_URL, $scope, $scopeCode);
+    }
+
+    /**
+     * Get store name
+     *
+     * @param string $scope
+     * @param string|null $scopeCode
+     * @return string|null
+     */
+    public function getStoreNameForScope(
+        string $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+        ?string $scopeCode = null
+    ): ?string {
+        return $this->config->getValue(Information::XML_PATH_STORE_INFO_NAME, $scope, $scopeCode);
+    }
+
+    /**
+     * Get current user role name
+     *
+     * @return string
+     */
+    public function getCurrentUserRoleName(): string
+    {
+        return $this->authSession->getUser()->getRole()->getRoleName();
+    }
 }

app/code/Magento/AdminAnalytics/composer.json

@@ -9,6 +9,7 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-config": "*",
+        "magento/module-store": "*",
         "magento/module-ui": "*",
         "magento/module-release-notification": "*"
     },