Merge pull request #2612 from Adyen/develop

Release 9.5.2
Adyen · May 21, 2024 · 46cb54f · 46cb54f
2 parents 651b0b7 + 8623517
commit 46cb54f
Show file tree

Hide file tree

Showing 19 changed files with 1,844 additions and 79 deletions.
diff --git a/Gateway/Http/Client/TransactionCapture.php b/Gateway/Http/Client/TransactionCapture.php
@@ -51,17 +51,18 @@ public function placeRequest(TransferInterface $transferObject): array
         $client = $this->adyenHelper->initializeAdyenClientWithClientConfig($clientConfig);
         $service = $this->adyenHelper->createAdyenCheckoutService($client);
 
-        $idempotencyKey = $this->idempotencyHelper->generateIdempotencyKey(
-            $request,
-            $headers['idempotencyExtraData'] ?? null
-        );
-
-        $requestOptions['idempotencyKey'] = $idempotencyKey;
         $requestOptions['headers'] = $this->adyenHelper->buildRequestHeaders();
 
         if (array_key_exists(self::MULTIPLE_AUTHORIZATIONS, $request)) {
             return $this->placeMultipleCaptureRequests($service, $request, $requestOptions);
         }
+        else {
+            $idempotencyKey = $this->idempotencyHelper->generateIdempotencyKey(
+                $request,
+                $headers['idempotencyExtraData'] ?? null
+            );
+            $requestOptions['idempotencyKey'] = $idempotencyKey;
+        }
 
         $this->adyenHelper->logRequest($request, Client::API_CHECKOUT_VERSION, '/captures');
 
@@ -80,15 +81,23 @@ private function placeMultipleCaptureRequests($service, $requestContainer, $requ
     {
         $response = [];
         foreach ($requestContainer[self::MULTIPLE_AUTHORIZATIONS] as $request) {
+            $idempotencyKeyExtraData = $request['idempotencyExtraData'];
+            unset($request['idempotencyExtraData']);
+            $idempotencyKey = $this->idempotencyHelper->generateIdempotencyKey(
+                $request,
+                $idempotencyKeyExtraData ?? null
+            );
+
+            $requestOptions['idempotencyKey'] = $idempotencyKey;
             try {
                 // Copy merchant account from parent array to every request array
                 $request[Requests::MERCHANT_ACCOUNT] = $requestContainer[Requests::MERCHANT_ACCOUNT];
                 $singleResponse = $service->captures($request, $requestOptions);
                 $singleResponse[self::FORMATTED_CAPTURE_AMOUNT] = $request['amount']['currency'] . ' ' .
-                $this->adyenHelper->originalAmount(
-                    $request['amount']['value'],
-                    $request['amount']['currency']
-                );
+                    $this->adyenHelper->originalAmount(
+                        $request['amount']['value'],
+                        $request['amount']['currency']
+                    );
                 $singleResponse = $this->copyParamsToResponse($singleResponse, $request);
                 $response[self::MULTIPLE_AUTHORIZATIONS][] = $singleResponse;
             } catch (AdyenException $e) {

diff --git a/Gateway/Http/Client/TransactionPayment.php b/Gateway/Http/Client/TransactionPayment.php
@@ -13,6 +13,7 @@
 
 use Adyen\AdyenException;
 use Adyen\Client;
+use Adyen\Payment\Gateway\Request\HeaderDataBuilder;
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\GiftcardPayment;
 use Adyen\Payment\Helper\Idempotency;
@@ -44,7 +45,7 @@ public function __construct(
         Idempotency $idempotencyHelper,
         OrdersApi $orderApiHelper,
         StoreManagerInterface $storeManager,
-        GiftcardPayment $giftcardPaymentHelper
+        GiftcardPayment $giftcardPaymentHelper,
     ) {
         $this->adyenHelper = $adyenHelper;
         $this->paymentResponseFactory = $paymentResponseFactory;
@@ -53,7 +54,6 @@ public function __construct(
         $this->orderApiHelper = $orderApiHelper;
         $this->storeManager = $storeManager;
         $this->giftcardPaymentHelper = $giftcardPaymentHelper;
-
         $this->remainingOrderAmount = null;
     }
 
@@ -84,7 +84,8 @@ public function placeRequest(TransferInterface $transferObject): array
                 $headers['idempotencyExtraData'] ?? null
             );
             $requestOptions['idempotencyKey'] = $idempotencyKey;
-            $requestOptions['headers'] = $this->adyenHelper->buildRequestHeaders();
+            $requestOptions['headers'] = $headers;
+
 
             $this->adyenHelper->logRequest($request, Client::API_CHECKOUT_VERSION, '/payments');
             $response = $service->payments($request, $requestOptions);

diff --git a/Gateway/Request/CaptureDataBuilder.php b/Gateway/Request/CaptureDataBuilder.php
@@ -188,6 +188,10 @@ public function buildPartialOrMultipleCaptureData($payment, $currency, $adyenOrd
                     $openInvoiceFields = $this->openInvoiceHelper->getOpenInvoiceDataForInvoice($invoice);
                     $authToCapture = array_merge($authToCapture, $openInvoiceFields);
                 }
+                $authToCapture['idempotencyExtraData'] = [
+                    'totalInvoiced' => $adyenOrderPayment[OrderPaymentInterface::TOTAL_CAPTURED] ?? 0,
+                    'originalPspReference' => $adyenOrderPayment[OrderPaymentInterface::PSPREFRENCE]
+            ] ;
 
                 $captureData[] = $authToCapture;
             }
@@ -200,11 +204,6 @@ public function buildPartialOrMultipleCaptureData($payment, $currency, $adyenOrd
 
         $request['body'] = $requestBody;
         $request['clientConfig'] = ["storeId" => $payment->getOrder()->getStoreId()];
-        $request['headers'] = [
-            'idempotencyExtraData' => [
-                'totalInvoiced' => $payment->getOrder()->getTotalInvoiced() ?? 0
-            ]
-        ];
 
         return $request;
     }

diff --git a/Gateway/Request/HeaderDataBuilder.php b/Gateway/Request/HeaderDataBuilder.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2024 Adyen MV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Gateway\Request;
+
+use Adyen\Payment\Helper\Data;
+use Magento\Payment\Gateway\Data\PaymentDataObject;
+use Magento\Payment\Gateway\Helper\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+
+class HeaderDataBuilder implements BuilderInterface
+{
+    const FRONTENDTYPE = 'frontendType';
+    const FRONTENDTYPE_HEADLESS = 'headless';
+
+    /**
+     * @var Data
+     */
+    private Data $adyenHelper;
+
+    /**
+     * PaymentDataBuilder constructor.
+     *
+     * @param Data $adyenHelper
+     */
+    public function __construct(
+        Data $adyenHelper
+    )
+    {
+        $this->adyenHelper = $adyenHelper;
+    }
+
+    /**
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject): array
+    {
+        /** @var PaymentDataObject $paymentDataObject */
+        $paymentDataObject = SubjectReader::readPayment($buildSubject);
+        $payment = $paymentDataObject->getPayment();
+        $headers = $this->adyenHelper->buildRequestHeaders($payment);
+        return ['headers' => $headers];
+    }
+}
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -14,6 +14,7 @@
 use Adyen\AdyenException;
 use Adyen\Client;
 use Adyen\Environment;
+use Adyen\Payment\Gateway\Request\HeaderDataBuilder;
 use Adyen\Service\Checkout;
 use Adyen\Payment\Logger\AdyenLogger;
 use Adyen\Payment\Model\Config\Source\RenderMode;
@@ -418,20 +419,14 @@ public function originalAmount($amount, $currency)
         return ($amount / $format);
     }
 
-
-
-
-
-
-
     /**
      * Retrieve decrypted hmac key
      *
      * @return string
      */
     public function getHmac($storeId = null)
     {
-        switch ($this->isDemoMode($storeId)) {
+        switch ($this->configHelper->isDemoMode($storeId)) {
             case true:
                 $hmacTest = $this->configHelper->getAdyenHppConfigData('hmac_test', $storeId);
                 if (is_null($hmacTest)) {
@@ -476,7 +471,7 @@ public function isMotoDemoMode(array $motoMerchantAccountProperties): bool
      */
     public function getAPIKey($storeId = null)
     {
-        if ($this->isDemoMode($storeId)) {
+        if ($this->configHelper->isDemoMode($storeId)) {
             $encryptedApiKeyTest = $this->configHelper->getAdyenAbstractConfigData('api_key_test', $storeId);
             if (is_null($encryptedApiKeyTest)) {
                 return null;
@@ -501,7 +496,7 @@ public function getAPIKey($storeId = null)
     public function getClientKey($storeId = null)
     {
         $clientKey = $this->configHelper->getAdyenAbstractConfigData(
-            $this->isDemoMode($storeId) ? 'client_key_test' : 'client_key_live',
+            $this->configHelper->isDemoMode($storeId) ? 'client_key_test' : 'client_key_live',
             $storeId
         );
 
@@ -520,7 +515,7 @@ public function getClientKey($storeId = null)
      */
     public function getWsUsername($storeId = null)
     {
-        if ($this->isDemoMode($storeId)) {
+        if ($this->configHelper->isDemoMode($storeId)) {
             $wsUsernameTest = $this->configHelper->getAdyenAbstractConfigData('ws_username_test', $storeId);
             if (is_null($wsUsernameTest)) {
                 return null;
@@ -1167,16 +1162,23 @@ public function getMagentoDetails()
         ];
     }
 
-    public function buildRequestHeaders()
+    public function buildRequestHeaders($payment = null)
     {
         $magentoDetails = $this->getMagentoDetails();
-        return [
+        $headers = [
             'external-platform-name' => $magentoDetails['name'],
             'external-platform-version' => $magentoDetails['version'],
             'external-platform-edition' => $magentoDetails['edition'],
             'merchant-application-name' => $this->getModuleName(),
             'merchant-application-version' => $this->getModuleVersion()
         ];
+
+        if(isset($payment) && !is_null($payment->getAdditionalInformation(HeaderDataBuilder::FRONTENDTYPE))) {
+            $headers[HeaderDataBuilder::FRONTENDTYPE] =
+                $payment->getAdditionalInformation(HeaderDataBuilder::FRONTENDTYPE);
+        }
+
+        return $headers;
     }
 
     /**
@@ -1493,7 +1495,7 @@ public function logRequest(array $request, $apiVersion, $endpoint)
         if ($isDemo) {
             $context['body'] = $request;
         } else {
-            $context['livePrefix'] = $this->getLiveEndpointPrefix($storeId);
+            $context['livePrefix'] = $this->configHelper->getLiveEndpointPrefix($storeId);
             $context['body'] = $this->filterReferences($request);
         }
 

diff --git a/Observer/AdyenCcDataAssignObserver.php b/Observer/AdyenCcDataAssignObserver.php
@@ -19,6 +19,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Adyen\Payment\Gateway\Request\HeaderDataBuilder;
 
 class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
 {
@@ -44,7 +45,8 @@ class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
         self::NUMBER_OF_INSTALLMENTS,
         self::CC_TYPE,
         self::RETURN_URL,
-        self::RECURRING_PROCESSING_MODEL
+        self::RECURRING_PROCESSING_MODEL,
+        HeaderDataBuilder::FRONTENDTYPE
     ];
 
     /**

diff --git a/Observer/AdyenPaymentMethodDataAssignObserver.php b/Observer/AdyenPaymentMethodDataAssignObserver.php
@@ -11,6 +11,7 @@
 
 namespace Adyen\Payment\Observer;
 
+use Adyen\Payment\Gateway\Request\HeaderDataBuilder;
 use Adyen\Payment\Helper\StateData;
 use Adyen\Payment\Helper\Util\CheckoutStateDataValidator;
 use Adyen\Payment\Helper\Util\DataArrayValidator;
@@ -19,7 +20,6 @@
 use Magento\Framework\Event\Observer;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 class AdyenPaymentMethodDataAssignObserver extends AbstractDataAssignObserver
 {
@@ -38,26 +38,24 @@ class AdyenPaymentMethodDataAssignObserver extends AbstractDataAssignObserver
         self::STATE_DATA,
         self::RETURN_URL,
         self::RECURRING_PROCESSING_MODEL,
-        self::CC_NUMBER
+        self::CC_NUMBER,
+        HeaderDataBuilder::FRONTENDTYPE
     ];
 
     protected CheckoutStateDataValidator $checkoutStateDataValidator;
     protected Collection $stateDataCollection;
     private StateData $stateData;
-    private StoreManagerInterface $storeManager;
     private Vault $vaultHelper;
 
     public function __construct(
         CheckoutStateDataValidator $checkoutStateDataValidator,
         Collection $stateDataCollection,
         StateData $stateData,
-        StoreManagerInterface $storeManager,
         Vault $vaultHelper
     ) {
         $this->checkoutStateDataValidator = $checkoutStateDataValidator;
         $this->stateDataCollection = $stateDataCollection;
         $this->stateData = $stateData;
-        $this->storeManager = $storeManager;
         $this->vaultHelper = $vaultHelper;
     }
 

diff --git a/README.md b/README.md
@@ -73,8 +73,8 @@ bin/magento setup:upgrade
 For more information see our [installation section](https://docs.adyen.com/developers/plugins/magento-2/set-up-the-plugin-in-magento?redirect#step1installtheplugin).
 
 ## Documentation
-[Magento 2 documentation](https://docs.adyen.com/developers/plugins/magento-2)
-
+- [Magento 2 documentation](https://docs.adyen.com/plugins/adobe-commerce)
+- [V9 migration guide](https://docs.adyen.com/plugins/adobe-commerce/migrate-to-a-new-version)
 
 ## Setup Cron
 Make sure that your Magento cron is running every minute. We are using a cronjob to process the notifications (our webhook service) and to update Adyen servers' IP addresses. The cronjobs will be executed every minute.