[Backport] 18901-Forgot-password-form-should-not-available-while-customer-is-log…

app/code/Magento/Backend/Block/DataProviders/UploadConfig.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Block\DataProviders;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Provides additional data for image uploader
+ */
+class UploadConfig implements ArgumentInterface
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
+     */
+    public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Get image resize configuration
+     *
+     * @return int
+     */
+    public function getIsResizeEnabled(): int
+    {
+        return (int)$this->config->getValue('system/upload_configuration/enable_resize');
+    }
+}

app/code/Magento/Backend/Test/Unit/Block/DataProviders/UploadConfigTest.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Test\Unit\Block\DataProviders;
+
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\Backend\Block\DataProviders\UploadConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class UploadConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ScopeConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var UploadConfig
+     */
+    private $uploadConfig;
+
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(ScopeConfig::class)
+            ->setMethods(['getValue'])
+            ->getMockForAbstractClass();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->uploadConfig =  $this->objectManagerHelper->getObject(
+            UploadConfig::class,
+            [
+                'config' => $this->config
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider configValuesDataProvider()
+     * @param int $configValue
+     * @param int $expectedValue
+     * @return void
+     */
+    public function testGetIsResizeEnabled(int $configValue, int $expectedValue)
+    {
+        $this->config->expects($this->once())
+            ->method('getValue')
+            ->with('system/upload_configuration/enable_resize')
+            ->willReturn($configValue);
+        $this->assertEquals($expectedValue, $this->uploadConfig->getIsResizeEnabled());
+    }
+
+    public function configValuesDataProvider(): array
+    {
+        return [
+            [1, 1],
+            [0, 0]
+        ];
+    }
+}

app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Service\V1;
+
+use Magento\Backend\Service\V1\ModuleService;
+use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Module List Service Test
+ *
+ * Covers \Magento\Sales\Model\ValidatorResultMerger
+ */
+class ModuleServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var ModuleService
+     */
+    private $moduleService;
+
+    /**
+     * @var ModuleListInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleListMock;
+
+    /**
+     * Object Manager
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->moduleListMock = $this->createMock(ModuleListInterface::class);
+        $this->objectManager = new ObjectManager($this);
+        $this->moduleService = $this->objectManager->getObject(
+            ModuleService::class,
+            [
+                'moduleList' => $this->moduleListMock,
+            ]
+        );
+    }
+
+    /**
+     * Test getModules method
+     *
+     * @return void
+     */
+    public function testGetModules()
+    {
+        $moduleNames = ['Magento_Backend', 'Magento_Catalog', 'Magento_Customer'];
+        $this->moduleListMock->expects($this->once())->method('getNames')->willReturn($moduleNames);
+
+        $expected = $moduleNames;
+        $actual = $this->moduleService->getModules();
+        $this->assertEquals($expected, $actual);
+    }
+}

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -322,15 +322,26 @@
             </group>
             <group id="upload_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Images Upload Configuration</label>
-                <field id="max_width" translate="label comment" type="text" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="enable_resize" translate="label" type="select" sortOrder="200" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Enable Frontend Resize</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Resize performed via javascript before file upload.</comment>
+                </field>
+                <field id="max_width" translate="label comment" type="text" sortOrder="300" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Maximum Width</label>
                     <validate>validate-greater-than-zero validate-number required-entry</validate>
                     <comment>Maximum allowed width for uploaded image.</comment>
+                    <depends>
+                        <field id="enable_resize">1</field>
+                    </depends>
                 </field>
-                <field id="max_height" translate="label comment" type="text" sortOrder="200" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="max_height" translate="label comment" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Maximum Height</label>
                     <validate>validate-greater-than-zero validate-number required-entry</validate>
                     <comment>Maximum allowed height for uploaded image.</comment>
+                    <depends>
+                        <field id="enable_resize">1</field>
+                    </depends>
                 </field>
             </group>
         </section>

app/code/Magento/Backend/etc/config.xml

@@ -29,6 +29,7 @@
                 <enable_charts>1</enable_charts>
             </dashboard>
             <upload_configuration>
+                <enable_resize>1</enable_resize>
                 <max_width>1920</max_width>
                 <max_height>1200</max_height>
             </upload_configuration>

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

@@ -14,7 +14,8 @@
         "Magento_Backend/js/media-uploader" : {
             "maxFileSize": <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?>,
             "maxWidth":<?= /* @escapeNotVerified */ $block->getImageUploadMaxWidth() ?> ,
-            "maxHeight": <?= /* @escapeNotVerified */ $block->getImageUploadMaxHeight() ?>
+            "maxHeight": <?= /* @escapeNotVerified */ $block->getImageUploadMaxHeight() ?>,
+            "isResizeEnabled": <?= /* @noEscape */ $block->getImageUploadConfigData()->getIsResizeEnabled() ?>
         }
     }'
 >

app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js

@@ -25,9 +25,20 @@ define([
          * @private
          */
         _create: function () {
-            var
-                self = this,
-                progressTmpl = mageTemplate('[data-template="uploader"]');
+            var self = this,
+                progressTmpl = mageTemplate('[data-template="uploader"]'),
+                isResizeEnabled = this.options.isResizeEnabled,
+                resizeConfiguration = {
+                    action: 'resize',
+                    maxWidth: this.options.maxWidth,
+                    maxHeight: this.options.maxHeight
+                };
+
+            if (!isResizeEnabled) {
+                resizeConfiguration = {
+                    action: 'resize'
+                };
+            }
 
             this.element.find('input[type=file]').fileupload({
                 dataType: 'json',
@@ -44,8 +55,7 @@ define([
                  * @param {Object} data
                  */
                 add: function (e, data) {
-                    var
-                        fileSize,
+                    var fileSize,
                         tmpl;
 
                     $.each(data.files, function (index, file) {
@@ -115,11 +125,9 @@ define([
                 process: [{
                     action: 'load',
                     fileTypes: /^image\/(gif|jpeg|png)$/
-                }, {
-                    action: 'resize',
-                    maxWidth: this.options.maxWidth,
-                    maxHeight: this.options.maxHeight
-                }, {
+                },
+                resizeConfiguration,
+                {
                     action: 'save'
                 }]
             });

app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php

@@ -148,7 +148,7 @@ private function updateBillingAddress(Quote $quote, array $details)
     {
         $billingAddress = $quote->getBillingAddress();
 
-        if ($this->config->isRequiredBillingAddress()) {
+        if ($this->config->isRequiredBillingAddress() && !empty($details['billingAddress'])) {
             $this->updateAddressData($billingAddress, $details['billingAddress']);
         } else {
             $this->updateAddressData($billingAddress, $details['shippingAddress']);

app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php

@@ -41,12 +41,14 @@ public function __construct(Config $config, ResolverInterface $resolver)
     }
 
     /**
-     * Retrieve assoc array of checkout configuration
+     * Retrieve assoc array of checkout configuration.
      *
      * @return array
      */
-    public function getConfig()
+    public function getConfig(): array
     {
+        $requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+
         return [
             'payment' => [
                 self::PAYPAL_CODE => [
@@ -60,6 +62,8 @@ public function getConfig()
                     'vaultCode' => self::PAYPAL_VAULT_CODE,
                     'skipOrderReview' => $this->config->isSkipOrderReview(),
                     'paymentIcon' => $this->config->getPayPalIcon(),
+                    'isRequiredBillingAddress' =>
+                        (int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll,
                 ]
             ]
         ];