Merge pull request #16 from OXID-eSales/PSPAYPAL-750-PayPal-Request-I…

…d-in-any-call Pspaypal 750 pay pal request id in any call
OXID-eSales · Apr 9, 2024 · 5a016a6 · 5a016a6
2 parents 5a0005e + 14eb2d4
commit 5a016a6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.13] -2024-04-09
+
+- PayPal-Request-Id based on serialized body, no extra PayPal-Request-Id necessary anymore
+
+## [2.0.12] -2024-03-19
+
+- introduce central log functionality
+
 ## [2.0.11] -2024-03-15
 
 - remove 500-redirect if some API Calls not work correctly

diff --git a/generated/Service/Orders.php b/generated/Service/Orders.php
@@ -37,7 +37,7 @@ class Orders extends BaseService
      * @throws ApiException
      * @return Order
      */
-    public function createOrder(OrderRequest $order, $payPalPartnerAttributionId, $payPalClientMetadataId, $prefer = 'return=minimal', $payPalRequestId = ''): Order
+    public function createOrder(OrderRequest $order, $payPalPartnerAttributionId, $payPalClientMetadataId, $prefer = 'return=minimal'): Order
     {
         $path = "/orders";
 
@@ -47,10 +47,6 @@ public function createOrder(OrderRequest $order, $payPalPartnerAttributionId, $p
         $headers['PayPal-Client-Metadata-Id'] = $payPalClientMetadataId;
         $headers['Prefer'] = $prefer;
 
-        if ($payPalRequestId) {
-            $headers['PayPal-Request-Id'] = $payPalRequestId;
-        }
-
         $body = json_encode($order, true);
         $response = $this->send('POST', $path, [], $headers, $body);
         $jsonData = json_decode($response->getBody(), true);
@@ -224,7 +220,7 @@ public function confirmTheOrder($payPalClientMetadataId, $id, ConfirmOrderReques
      * @throws ApiException
      * @return Order
      */
-    public function authorizePaymentForOrder($payPalClientMetadataId, $id, OrderAuthorizeRequest $authorizeRequest, $payPalAuthAssertion, string $payPalPartnerAttributionId = '', $payPalRequestId = '' , $prefer = 'return=minimal'): Order
+    public function authorizePaymentForOrder($payPalClientMetadataId, $id, OrderAuthorizeRequest $authorizeRequest, $payPalAuthAssertion, string $payPalPartnerAttributionId = '', $prefer = 'return=minimal'): Order
     {
         $path = "/orders/{$id}/authorize";
 
@@ -234,10 +230,6 @@ public function authorizePaymentForOrder($payPalClientMetadataId, $id, OrderAuth
         $headers['PayPal-Auth-Assertion'] = $payPalAuthAssertion;
         $headers['Prefer'] = $prefer;
 
-        if ($payPalRequestId) {
-            $headers['PayPal-Request-Id'] = $payPalRequestId;
-        }
-
         if ($payPalPartnerAttributionId) {
             $headers['PayPal-Partner-Attribution-Id'] = $payPalPartnerAttributionId;
         }
@@ -276,7 +268,7 @@ public function authorizePaymentForOrder($payPalClientMetadataId, $id, OrderAuth
      * @throws ApiException
      * @return Order
      */
-    public function capturePaymentForOrder($payPalClientMetadataId, $id, OrderCaptureRequest $orderCaptureRequest, $payPalAuthAssertion, string $payPalPartnerAttributionId = '', $payPalRequestId = '', $prefer = 'return=minimal'): Order
+    public function capturePaymentForOrder($payPalClientMetadataId, $id, OrderCaptureRequest $orderCaptureRequest, $payPalAuthAssertion, string $payPalPartnerAttributionId = '', $prefer = 'return=minimal'): Order
     {
         $path = "/orders/{$id}/capture";
 
@@ -286,10 +278,6 @@ public function capturePaymentForOrder($payPalClientMetadataId, $id, OrderCaptur
         $headers['PayPal-Auth-Assertion'] = $payPalAuthAssertion;
         $headers['Prefer'] = $prefer;
 
-        if ($payPalRequestId) {
-            $headers['PayPal-Request-Id'] = $payPalRequestId;
-        }
-
         if ($payPalPartnerAttributionId) {
             $headers['PayPal-Partner-Attribution-Id'] = $payPalPartnerAttributionId;
         }

diff --git a/generated/Service/Payments.php b/generated/Service/Payments.php
@@ -92,18 +92,14 @@ public function showDetailsForAuthorizedPayment($authorizationId): Authorization
      * @throws ApiException
      * @return Capture
      */
-    public function captureAuthorizedPayment($authorizationId, CaptureRequest $capture, string $payPalPartnerAttributionId = '', $payPalRequestId = '',$prefer = 'return=minimal'): Capture
+    public function captureAuthorizedPayment($authorizationId, CaptureRequest $capture, string $payPalPartnerAttributionId = '',$prefer = 'return=minimal'): Capture
     {
         $path = "/authorizations/{$authorizationId}/capture";
 
         $headers = [];
         $headers['Content-Type'] = 'application/json';
         $headers['Prefer'] = $prefer;
 
-        if ($payPalRequestId) {
-            $headers['PayPal-Request-Id'] = $payPalRequestId;
-        }
-
         if ($payPalPartnerAttributionId) {
             $headers['PayPal-Partner-Attribution-Id'] = $payPalPartnerAttributionId;
         }
@@ -140,18 +136,14 @@ public function captureAuthorizedPayment($authorizationId, CaptureRequest $captu
      * @return Authorization
      *@throws ApiException
      */
-    public function reauthorizeAuthorizedPayment($authorizationId, ReauthorizeRequest $reauthorizeRequest, string $payPalPartnerAttributionId = '', $payPalRequestId = '',$prefer = 'return=minimal'): Authorization
+    public function reauthorizeAuthorizedPayment($authorizationId, ReauthorizeRequest $reauthorizeRequest, string $payPalPartnerAttributionId = '', $prefer = 'return=minimal'): Authorization
     {
         $path = "/authorizations/{$authorizationId}/reauthorize";
 
         $headers = [];
         $headers['Content-Type'] = 'application/json';
         $headers['Prefer'] = $prefer;
 
-        if ($payPalRequestId) {
-            $headers['PayPal-Request-Id'] = $payPalRequestId;
-        }
-
         if ($payPalPartnerAttributionId) {
             $headers['PayPal-Partner-Attribution-Id'] = $payPalPartnerAttributionId;
         }
@@ -270,7 +262,7 @@ public function showCapturedPaymentDetails($captureId): Capture
      * @throws ApiException
      * @return Refund
      */
-    public function refundCapturedPayment($captureId, RefundRequest $refundRequest, $payPalAuthAssertion, string $payPalPartnerAttributionId = '', $payPalRequestId = '',$prefer = 'return=minimal'): Refund
+    public function refundCapturedPayment($captureId, RefundRequest $refundRequest, $payPalAuthAssertion, string $payPalPartnerAttributionId = '', $prefer = 'return=minimal'): Refund
     {
         $path = "/captures/{$captureId}/refund";
 
@@ -279,10 +271,6 @@ public function refundCapturedPayment($captureId, RefundRequest $refundRequest,
         $headers['PayPal-Auth-Assertion'] = $payPalAuthAssertion;
         $headers['Prefer'] = $prefer;
 
-        if ($payPalRequestId) {
-            $headers['PayPal-Request-Id'] = $payPalRequestId;
-        }
-
         if ($payPalPartnerAttributionId) {
             $headers['PayPal-Partner-Attribution-Id'] = $payPalPartnerAttributionId;
         }

diff --git a/src/Service/BaseService.php b/src/Service/BaseService.php
@@ -45,6 +45,11 @@ protected function send($method, $path, $params = [], $headers = [], $body = nul
             $path = "$path?$q";
         }
         $fullPath = $this->basePath . $path;
+
+        if ($body) {
+            $headers['PayPal-Request-Id'] = md5(serialize($body));
+        }
+
         $request = $this->client->createRequest($method, $fullPath, $headers, $body);
 
         $logger->log('debug', 'PayPal SEND path ' . $path);