Merge branch '2.4-develop' into ISSUE-30286-widget-remove-layout-update

magento · Dec 8, 2020 · c7ee4fb · c7ee4fb
2 parents 3f81a91 + 500a9e5
commit c7ee4fb
Show file tree

Hide file tree

Showing 462 changed files with 11,877 additions and 1,580 deletions.
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml b/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>
diff --git a/app/code/Magento/AdminAnalytics/ViewModel/Metadata.php b/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();
+    }
 }
diff --git a/app/code/Magento/AdminAnalytics/composer.json b/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": "*"
     },

diff --git a/app/code/Magento/AdminAnalytics/etc/adminhtml/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/adminhtml/csp_whitelist.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+        <policies>
+            <policy id="script-src">
+                <values>
+                    <value id="aptrinsic" type="host">*.aptrinsic.com</value>
+                </values>
+            </policy>
+            <policy id="style-src">
+                <values>
+                    <value id="aptrinsic" type="host">*.aptrinsic.com</value>
+                    <value id="fonts_googleapis" type="host">fonts.googleapis.com</value>
+                </values>
+            </policy>
+            <policy id="img-src">
+                <values>
+                    <value id="aptrinsic" type="host">*.aptrinsic.com</value>
+                    <value id="storage_googleapis" type="host">storage.googleapis.com</value>
+                </values>
+            </policy>
+            <policy id="connect-src">
+                <values>
+                    <value id="aptrinsic" type="host">*.aptrinsic.com</value>
+                </values>
+            </policy>
+            <policy id="font-src">
+                <values>
+                    <value id="fonts_gstatic" type="host">fonts.gstatic.com</value>
+                </values>
+            </policy>
+        </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/layout/default.xml b/app/code/Magento/AdminAnalytics/view/adminhtml/layout/default.xml
@@ -10,7 +10,7 @@
         <referenceContainer name="header">
             <block name="tracking" as="tracking" template="Magento_AdminAnalytics::tracking.phtml" ifconfig="admin/usage/enabled">
                 <arguments>
-                    <argument name="tracking_url" xsi:type="string">//assets.adobedtm.com/launch-EN30eb7ffa064444f1b8b0368ef38fd3a9.min.js</argument>
+                    <argument name="tracking_url" xsi:type="string">//assets.adobedtm.com/a7d65461e54e/37baabec1b6e/launch-177bc126c8e6.min.js</argument>
                     <argument name="metadata" xsi:type="object">Magento\AdminAnalytics\ViewModel\Metadata</argument>
                 </arguments>
             </block>

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
@@ -19,11 +19,20 @@
     false
 ) ?>
 
-<?php $scriptString = '
+<?php
+/** @var \Magento\AdminAnalytics\ViewModel\Metadata $metadata */
+$metadata = $block->getMetadata();
+$scriptString = '
     var adminAnalyticsMetadata = {
-        "version": "' . $block->escapeJs($block->getMetadata()->getMagentoVersion()) . '",
-        "user": "' . $block->escapeJs($block->getMetadata()->getCurrentUser()) . '",
-        "mode": "' . $block->escapeJs($block->getMetadata()->getMode()) . '"
+        "secure_base_url": "' . $block->escapeJs($metadata->getSecureBaseUrlForScope()) . '",
+        "version": "' . $block->escapeJs($metadata->getMagentoVersion()) . '",
+        "product_edition": "' . $block->escapeJs($metadata->getProductEdition()) . '",
+        "user": "' . $block->escapeJs($metadata->getCurrentUser()) . '",
+        "mode": "' . $block->escapeJs($metadata->getMode()) . '",
+        "store_name_default": "' . $block->escapeJs($metadata->getStoreNameForScope()) . '",
+        "admin_user_created": "' . $block->escapeJs($metadata->getCurrentUserCreatedDate()) . '",
+        "admin_user_logdate": "' . $block->escapeJs($metadata->getCurrentUserLogDate()) . '",
+        "admin_user_role_name": "' . $block->escapeJs($metadata->getCurrentUserRoleName()) . '"
     };
 ';
 ?>

diff --git a/app/code/Magento/Analytics/etc/config.xml b/app/code/Magento/Analytics/etc/config.xml
@@ -23,5 +23,12 @@
                 <token/>
             </general>
         </analytics>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <analytics_folder>analytics</analytics_folder>
+                </allowed_resources>
+            </media_storage_configuration>
+        </system>
     </default>
 </config>
diff --git a/app/code/Magento/Authorization/Model/Rules.php b/app/code/Magento/Authorization/Model/Rules.php
@@ -25,44 +25,30 @@
 class Rules extends \Magento\Framework\Model\AbstractModel
 {
     /**
-     * Class constructor
-     *
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Authorization\Model\ResourceModel\Rules $resource
-     * @param \Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Authorization\Model\ResourceModel\Rules $resource,
-        \Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection,
-        array $data = []
-    ) {
-        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-    }
-
-    /**
-     * Class constructor
-     *
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
         $this->_init(\Magento\Authorization\Model\ResourceModel\Rules::class);
     }
 
     /**
+     * Obsolete method of update
+     *
      * @return $this
+     * @deprecated Method was never implemented and used.
      */
     public function update()
     {
-        $this->getResource()->update($this);
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        trigger_error('Method was never implemented and used.', E_USER_DEPRECATED);
+
         return $this;
     }
 
     /**
+     * Save authorization rule relation
+     *
      * @return $this
      */
     public function saveRel()

diff --git a/app/code/Magento/AwsS3/Driver/AwsS3.php b/app/code/Magento/AwsS3/Driver/AwsS3.php
@@ -304,6 +304,7 @@ public function getAbsolutePath($basePath, $path, $scheme = null)
      * Resolves relative path.
      *
      * @param string $path Absolute path
+     * @param bool $fixPath
      * @return string Relative path
      */
     private function normalizeRelativePath(string $path, bool $fixPath = false): string
@@ -358,7 +359,7 @@ public function isFile($path): bool
             return false;
         }
 
-        $path = $this->normalizeRelativePath($path, true);;
+        $path = $this->normalizeRelativePath($path, true);
 
         if ($this->adapter->has($path) && ($meta = $this->adapter->getMetadata($path))) {
             return ($meta['type'] ?? null) === self::TYPE_FILE;

diff --git a/app/code/Magento/AwsS3/Driver/AwsS3Factory.php b/app/code/Magento/AwsS3/Driver/AwsS3Factory.php
@@ -86,6 +86,10 @@ public function createConfigured(
             throw new DriverException(__('Bucket and region are required values'));
         }
 
+        if (!empty($config['http_handler'])) {
+            $config['http_handler'] = $this->objectManager->create($config['http_handler'])($config);
+        }
+
         $client = new S3Client($config);
         $adapter = new AwsS3Adapter($client, $config['bucket'], $prefix);