Merge remote-tracking branch 'upstream/2.4.3-develop' into MC-41512

Author: hwyu@adobe.com

app/code/Magento/Paypal/Controller/Express/OnAuthorization.php

@@ -114,17 +114,11 @@ public function __construct(
     public function execute(): ResultInterface
     {
         $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-        $quoteId = $this->getRequest()->getParam('quoteId');
         $payerId = $this->getRequest()->getParam('payerId');
         $tokenId = $this->getRequest()->getParam('paymentToken');
-        $customerId = $this->getRequest()->getParam('customerId') ?: $this->_customerSession->getId();
 
         try {
-            if ($quoteId) {
-                $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
-            } else {
-                $quote = $this->_getQuote();
-            }
+            $quote = $this->_getQuote();
 
             $responseContent = [
                 'success' => true,

app/code/Magento/Paypal/etc/csp_whitelist.xml

@@ -37,5 +37,10 @@
                 <value id="www_pilot_payflowlink_paypal" type="host">pilot-payflowlink.paypal.com</value>
             </values>
         </policy>
+        <policy id="connect-src">
+            <values>
+                <value id="www_sandbox_paypal_com" type="host">www.sandbox.paypal.com</value>
+            </values>
+        </policy>
     </policies>
 </csp_whitelist>

app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js

@@ -47,8 +47,6 @@ define([
         var params = {
             paymentToken: data.orderID,
             payerId: data.payerID,
-            quoteId: clientConfig.quoteId || '',
-            customerId: clientConfig.customerId || '',
             'form_key': clientConfig.formKey
         };
 

lib/internal/Magento/Framework/File/Test/Unit/UploaderTest.php

@@ -62,7 +62,7 @@ public function getCorrectFileNameProvider()
                 'a.' . str_repeat('b', 88)
             ],
             [
-                'a.' . str_repeat('b', 199), // 201 characters
+                'a.' . str_repeat('b', 89),
                 true
             ]
         ];

lib/internal/Magento/Framework/File/Uploader.php

@@ -496,7 +496,7 @@ public static function getCorrectFileName($fileName)
         $fileInfo['extension'] = $fileInfo['extension'] ?? '';
 
         // account for excessively long filenames that cannot be stored completely in database
-        $maxFilenameLength = 200;
+        $maxFilenameLength = 90;
 
         if (strlen($fileInfo['basename']) > $maxFilenameLength) {
             throw new \LengthException(