Merge remote-tracking branch 'origin/MAGETWO-96138' into 2.3-develop

Author: viktym

app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php

@@ -6,7 +6,17 @@
  */
 namespace Magento\Paypal\Controller\Express\AbstractExpress;
 
-class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Paypal\Controller\Express\AbstractExpress;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Returns shipping rates by server-to-server request from PayPal.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ShippingOptionsCallback extends AbstractExpress implements CsrfAwareActionInterface
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
@@ -65,4 +75,21 @@ public function execute()
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
 }

app/code/Magento/Paypal/Model/Express/Checkout.php

@@ -1076,6 +1076,7 @@ protected static function cmpShippingOptions(DataObject $option1, DataObject $op
      */
     protected function _matchShippingMethodCode(Address $address, $selectedCode)
     {
+        $address->collectShippingRates();
         $options = $this->_prepareShippingOptions($address, false);
         foreach ($options as $option) {
             if ($selectedCode === $option['code'] // the proper case as outlined in documentation

dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php

@@ -72,7 +72,7 @@ protected function setUp()
 
         $this->api = $this->getMockBuilder(Nvp::class)
             ->disableOriginalConstructor()
-            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress'])
+            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress', 'getShippingRateCode'])
             ->getMock();
 
         $this->api->expects($this->any())
@@ -302,6 +302,8 @@ public function testReturnFromPaypal()
     public function testReturnFromPaypalButton()
     {
         $quote = $this->getFixtureQuote();
+        $quote->getShippingAddress()->setShippingMethod('');
+
         $this->prepareCheckoutModel($quote);
         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
 
@@ -317,6 +319,8 @@ public function testReturnFromPaypalButton()
         $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
         $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
 
+        $this->assertEquals('flatrate_flatrate', $shippingAddress->getShippingMethod());
+
         $this->assertEquals([$exportedShippingData['street']], $billingAddress->getStreet());
         $this->assertEquals($exportedShippingData['firstname'], $billingAddress->getFirstname());
         $this->assertEquals($exportedShippingData['city'], $billingAddress->getCity());
@@ -551,6 +555,9 @@ private function prepareCheckoutModel(Quote $quote, $prefix = '')
         $this->api->method('getExportedShippingAddress')
             ->willReturn($exportedShippingAddress);
 
+        $this->api->method('getShippingRateCode')
+            ->willReturn('flatrate_flatrate Flat Rate - Fixed');
+
         $this->paypalInfo->method('importToPayment')
             ->with($this->api, $quote->getPayment());
     }
@@ -573,7 +580,7 @@ private function getExportedData(): array
                 'city'       => 'Denver',
                 'street'     => '66 Pearl St',
                 'postcode'   => '80203',
-                'telephone'  => '555-555-555'
+                'telephone'  => '555-555-555',
             ],
             'billing' => [
                 'email'      => 'customer@example.com',