Merge remote-tracking branch 'l3/ACP2E-2533' into Tier4-PR-Delivery-12-1-23

veloraven · veloraven · commit 5b6fa6218248 · 2023-12-05T14:01:21.000-06:00
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -44,6 +44,8 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
 
     public const DO_EXPRESS_CHECKOUT_PAYMENT = 'DoExpressCheckoutPayment';
 
+    public const DO_EXPRESS_CHECKOUT = 'DoExpressCheckout';
+
     public const CALLBACK_RESPONSE = 'CallbackResponse';
 
     /**
@@ -687,7 +689,11 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      *
      * @var array
      */
-    protected $_requiredResponseParams = [self::DO_DIRECT_PAYMENT => ['ACK', 'CORRELATIONID', 'AMT']];
+    protected $_requiredResponseParams = [
+        self::DO_DIRECT_PAYMENT => ['ACK', 'CORRELATIONID', 'AMT'],
+        self::DO_EXPRESS_CHECKOUT => ['ACK'],
+        self::DO_EXPRESS_CHECKOUT_PAYMENT => ['ACK']
+    ];
 
     /**
      * Warning codes recollected after each API call
@@ -737,6 +743,11 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
      */
     protected $_headers = [];
 
+    /**
+     * @var Curl
+     */
+    private $curl;
+
     /**
      * @param \Magento\Customer\Helper\Address $customerAddress
      * @param \Psr\Log\LoggerInterface $logger
@@ -1154,15 +1165,13 @@ protected function _postProcessResponse($response)
     }
 
     /**
-     * Do the API call
+     * Prepare request for the API call
      *
      * @param string $methodName
      * @param array $request
      * @return array
-     * @throws ClientException|\Magento\Framework\Exception\LocalizedException|\Exception
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function call($methodName, array $request)
+    private function prepareRequest(string $methodName, array $request): array
     {
         $request = $this->_addMethodToRequest($methodName, $request);
         $eachCallRequest = $this->_prepareEachCallRequest($methodName);
@@ -1172,28 +1181,83 @@ public function call($methodName, array $request)
                 unset($eachCallRequest[$key]);
             }
         }
-        $request = $this->_exportToRequest($eachCallRequest, $request);
-        $debugData = ['url' => $this->getApiEndpoint(), $methodName => $request];
+        return $this->_exportToRequest($eachCallRequest, $request);
+    }
 
-        try {
-            /** @var Curl $http */
-            $http = $this->_curlFactory->create();
+    /**
+     * Creates a Curl object and sets parameters for the call
+     *
+     * @param array $request
+     * @return Curl
+     */
+    private function getCurl(array $request = null): Curl
+    {
+        if (!$this->curl) {
+            $this->curl = $this->_curlFactory->create();
             $config = ['timeout' => 60, 'verifypeer' => $this->_config->getValue('verifyPeer')];
             if ($this->getUseProxy()) {
                 $config['proxy'] = $this->getProxyHost() . ':' . $this->getProxyPort();
             }
             if ($this->getUseCertAuthentication()) {
                 $config['ssl_cert'] = $this->getApiCertificate();
             }
-            $http->setOptions($config);
-            $http->write(
-                Request::METHOD_POST,
-                $this->getApiEndpoint(),
-                '1.1',
-                $this->_headers,
-                $this->_buildQuery($request)
+            $this->curl->setOptions($config);
+            if ($request) {
+                $this->curl->write(
+                    Request::METHOD_POST,
+                    $this->getApiEndpoint(),
+                    '1.1',
+                    $this->_headers,
+                    $this->_buildQuery($request)
+                );
+            }
+        }
+        return  $this->curl;
+    }
+
+    /**
+     * Checks if transport errors occurred and throws exception if needed
+     *
+     * @return void
+     * @throws ClientException
+     */
+    private function handleConnectionErrors(): void
+    {
+        if ($this->getCurl()->getErrno()) {
+            $this->_logger->critical(
+                new \Exception(
+                    sprintf(
+                        'PayPal NVP CURL connection error #%s: %s',
+                        $this->getCurl()->getErrno(),
+                        $this->getCurl()->getError()
+                    )
+                )
+            );
+            $this->getCurl()->close();
+
+            throw new ClientException(
+                __('Payment Gateway is unreachable at the moment. Please use another payment option.')
             );
-            $response = $http->read();
+        }
+        // cUrl resource must be closed after checking it for errors
+        $this->getCurl()->close();
+    }
+
+    /**
+     * Do the API call
+     *
+     * @param string $methodName
+     * @param array $request
+     * @return array
+     * @throws ClientException|\Magento\Framework\Exception\LocalizedException|\Exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function call($methodName, array $request)
+    {
+        $request = $this->prepareRequest($methodName, $request);
+        $debugData = ['url' => $this->getApiEndpoint(), $methodName => $request];
+        try {
+            $response = $this->getCurl($request)->read();
         } catch (\Exception $e) {
             $debugData['http_error'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
             $this->_debug($debugData);
@@ -1203,29 +1267,11 @@ public function call($methodName, array $request)
         $response = preg_split('/^\r?$/m', $response, 2);
         $response = trim($response[1] ?? '');
         $response = $this->_deformatNVP($response);
-
         $debugData['response'] = $response;
         $this->_debug($debugData);
-
         $response = $this->_postProcessResponse($response);
 
-        // handle transport error
-        if ($http->getErrno()) {
-            $this->_logger->critical(
-                new \Exception(
-                    sprintf('PayPal NVP CURL connection error #%s: %s', $http->getErrno(), $http->getError())
-                )
-            );
-            $http->close();
-
-            throw new ClientException(
-                __('Payment Gateway is unreachable at the moment. Please use another payment option.')
-            );
-        }
-
-        // cUrl resource must be closed after checking it for errors
-        $http->close();
-
+        $this->handleConnectionErrors();
         if (!$this->_validateResponse($methodName, $response)) {
             $this->_logger->critical(new \Exception(__('PayPal response hasn\'t required fields.')));
             throw new \Magento\Framework\Exception\LocalizedException(
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
@@ -161,6 +161,7 @@ public function testCall($response, $processableErrors, $exception, $exceptionMe
         $this->curl->expects($this->once())
             ->method('read')
             ->willReturn($response);
+        $this->curl->method('getInfo')->with(CURLINFO_HTTP_CODE)->willReturn(200);
         $this->model->setProcessableErrors($processableErrors);
         $this->customLoggerMock->expects($this->once())
             ->method('debug');
@@ -218,6 +219,7 @@ public function testCallGetExpressCheckoutDetails($input, $expected)
         $this->curl->expects($this->once())
             ->method('read')
             ->willReturn($input);
+        $this->curl->method('getInfo')->with(CURLINFO_HTTP_CODE)->willReturn(200);
         $this->model->callGetExpressCheckoutDetails();
         $address = $this->model->getExportedShippingAddress();
         $this->assertEquals($expected['firstName'], $address->getData('firstname'));
@@ -281,6 +283,7 @@ public function testCallDoReauthorization()
                 . '&PROTECTIONELIGIBILITYTYPE=' . $protectionEligibilityType
             );
 
+        $this->curl->method('getInfo')->with(CURLINFO_HTTP_CODE)->willReturn(200);
         $this->model->callDoReauthorization();
 
         $expectedImportedData = [
@@ -315,11 +318,26 @@ public function testCallTransactionHasBeenCompleted()
         $this->curl->expects($this->once())
             ->method('read')
             ->willReturn($response);
+        $this->curl->method('getInfo')->with(CURLINFO_HTTP_CODE)->willReturn(200);
         $this->model->setProcessableErrors($processableErrors);
 
         $this->expectExceptionMessageMatches('/PayPal gateway has rejected request/');
         $this->expectException(ProcessableException::class);
 
         $this->model->call('DoExpressCheckout', ['data' => 'some data']);
     }
+
+    /**
+     * Test handling error response
+     */
+    public function testCallTransactionOnError()
+    {
+        $response = 'HTTP/1.1 502 Bad Gateway';
+        $this->curl->expects($this->once())
+            ->method('read')
+            ->willReturn($response);
+        $this->expectExceptionMessageMatches('/Something went wrong while processing your order/');
+
+        $this->model->call('DoExpressCheckout', ['data' => 'some data']);
+    }
 }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -56,6 +56,10 @@ define([
             clientConfig.rendererComponent.beforeOnAuthorize(deferred.resolve, deferred.reject, actions)
                 .then(function () {
                     $.post(clientConfig.onAuthorizeUrl, params).done(function (res) {
+                        if (res.success === false) {
+                            clientConfig.rendererComponent.catchOnAuthorize(res, deferred.resolve, deferred.reject);
+                            return;
+                        }
                         clientConfig.rendererComponent
                             .afterOnAuthorize(res, deferred.resolve, deferred.reject, actions);
                         customerData.set('paypal-funding-source', '');
