Fix the issue with missing origin from state

CS-5934
Adyen · Sep 30, 2024 · 2766079 · 2766079
1 parent cdc1167
commit 2766079
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/Handlers/AbstractPaymentMethodHandler.php b/src/Handlers/AbstractPaymentMethodHandler.php
@@ -672,12 +672,9 @@ protected function preparePaymentsRequest(
             $paymentRequest->setLineItems($lineItems);
         }
 
-        //Setting info from statedata additionalData if present
-        if (!empty($stateDataAdditionalData['origin'])) {
-            $origin = $stateDataAdditionalData['origin'];
-        } else {
-            $origin = $this->salesChannelRepository->getCurrentDomainUrl($salesChannelContext);
-        }
+        $origin = $stateDataAdditionalData['origin'] ??
+            $request['origin'] ??
+            $this->salesChannelRepository->getCurrentDomainUrl($salesChannelContext);
 
         $paymentRequest->setOrigin($origin);
         $paymentRequest->setAdditionaldata(['allow3DS2' => true]);

diff --git a/src/Util/CheckoutStateDataValidator.php b/src/Util/CheckoutStateDataValidator.php
@@ -20,7 +20,8 @@ class CheckoutStateDataValidator
         'storePaymentMethod',
         'conversionId',
         'paymentData',
-        'details'
+        'details',
+        'origin'
     );
 
     /**