[PW-2087] Add Swish Payment Method and upgrade Component version to 3.4.0 This commit has the following changes: (Adyen#770)

* [PW-2087] This commit has the following changes:
* With the added environment into the component is does not mather if we use the test or live component url. To remove complexity we will use the live endpoint on both environments.
* Upgrade component version from 3.2.0 to 3.4.0. This requires a different way of loading in the component. This will change all payment method integration that is using checkout component.
* Add swish payment method support with support for pending payment results and redering a QR code.
* Environment and originKey is now as well needed for alternative payment methods so moved this into a genericConfigProvider.
* The threeDS2processor is being used for 3DS2 and action payment methods. TODO we need to rename this to a generic name into the code this will mean a breaking change as interface will rename and PWA needs to adopt different API endpoint as this is a quick feature release I kept it out of scope.
* Rename threeDS2PaymentData to generic adyenPaymentData as this will be used for alternative payent methods as well.
* Remove unused ThreeDS2ResponseValidator file

* fix phpcs warning

* Remove duplicated getCheckoutEnvironment function

* Update view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js

* remove debugger and add comment

* Update view/frontend/web/js/view/payment/adyen-methods.js

* Update Model/AdyenThreeDS2Process.php

* revert hideCVC for recurring contracts needed to hide

* Only for pending show back the component to the checkout form. For PresentToShopper redirect to success page to show action component.

Co-authored-by: attilak <[email protected]>
Co-authored-by: Attila Kiss <[email protected]>

Author: 3 people

Gateway/Validator/CheckoutResponseValidator.php

@@ -68,22 +68,23 @@ public function validate(array $validationSubject)
         $errorMessages = [];
         // validate result
         if (!empty($response['resultCode'])) {
+            $payment->setAdditionalInformation('resultCode', $response['resultCode']);
             switch ($response['resultCode']) {
                 case "IdentifyShopper":
                     $payment->setAdditionalInformation('threeDSType', $response['resultCode']);
                     $payment->setAdditionalInformation(
                         'threeDS2Token',
                         $response['authentication']['threeds2.fingerprintToken']
                     );
-                    $payment->setAdditionalInformation('threeDS2PaymentData', $response['paymentData']);
+                    $payment->setAdditionalInformation('adyenPaymentData', $response['paymentData']);
                     break;
                 case "ChallengeShopper":
                     $payment->setAdditionalInformation('threeDSType', $response['resultCode']);
                     $payment->setAdditionalInformation(
                         'threeDS2Token',
                         $response['authentication']['threeds2.challengeToken']
                     );
-                    $payment->setAdditionalInformation('threeDS2PaymentData', $response['paymentData']);
+                    $payment->setAdditionalInformation('adyenPaymentData', $response['paymentData']);
                     break;
                 case "Authorised":
                 case "Received":
@@ -122,6 +123,12 @@ public function validate(array $validationSubject)
                         $payment->setAdditionalInformation('pspReference', $response['pspReference']);
                     }
                     break;
+                case 'Pending':
+                    $payment->setAdditionalInformation('adyenPaymentData', $response['paymentData']);
+                    if (!empty($response['action'])) {
+                        $payment->setAdditionalInformation('action', $response['action']);
+                    }
+                    break;
                 case "RedirectShopper":
                     $payment->setAdditionalInformation('threeDSType', $response['resultCode']);
 

Gateway/Validator/ThreeDS2ResponseValidator.php

@@ -34,6 +34,7 @@ class Data extends AbstractHelper
     const MODULE_NAME = 'adyen-magento2';
     const TEST = 'test';
     const LIVE = 'live';
+    // Only used for backend orders! Checkout in front-end is using different checkout version see web folder
     const CHECKOUT_COMPONENT_JS_LIVE = 'https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/3.2.0/adyen.js';
     const CHECKOUT_COMPONENT_JS_TEST = 'https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/3.2.0/adyen.js';
 
@@ -680,12 +681,16 @@ public function isAdyenGooglePayEnabled($storeId = null)
     }
 
     /**
-     * @param null|int|string $storeId
+     * @param string $storeId
      * @return mixed
      */
     public function getAdyenGooglePayMerchantIdentifier($storeId = null)
     {
-        return $this->getAdyenGooglePayConfigData('merchant_identifier', $storeId);
+        $value = $this->getAdyenGooglePayConfigData('merchant_identifier', $storeId);
+        if($value === null) {
+            return '';
+        }
+        return $value;
     }
 
     /**

Helper/Data.php

@@ -25,6 +25,7 @@
 namespace Adyen\Payment\Model;
 
 use Adyen\Payment\Model\Ui\AdyenCcConfigProvider;
+use Adyen\Payment\Model\Ui\AdyenHppConfigProvider;
 use Adyen\Payment\Model\Ui\AdyenOneclickConfigProvider;
 
 class AdyenOrderPaymentStatus implements \Adyen\Payment\Api\AdyenOrderPaymentStatusInterface
@@ -87,6 +88,21 @@ public function getOrderPaymentStatus($orderId)
 
             return $this->adyenHelper->buildThreeDS2ProcessResponseJson($type, $token);
         }
+
+
+        /**
+         * If payment method result is Pending and action is provided provide component action back to checkout
+         */
+        if ($payment->getMethod() === AdyenHppConfigProvider::CODE) {
+            $additionalInformation = $payment->getAdditionalInformation();
+            if (
+                !empty($additionalInformation['action']) &&
+                $additionalInformation['resultCode'] == 'Pending'
+            ) {
+                return json_encode(['action' => $additionalInformation['action']]);
+            }
+        }
+
         return true;
     }
 }

Model/AdyenOrderPaymentStatus.php

@@ -23,7 +23,7 @@
 
 namespace Adyen\Payment\Model;
 
-use \Adyen\Payment\Api\AdyenThreeDS2ProcessInterface;
+use Adyen\Payment\Api\AdyenThreeDS2ProcessInterface;
 
 class AdyenThreeDS2Process implements AdyenThreeDS2ProcessInterface
 {
@@ -92,21 +92,23 @@ public function initiate($payload)
         } else {
             // Create order by order id
             $order = $this->orderFactory->create()->load($payload['orderId']);
+            // don't send orderId to adyen. Improve that orderId and state.data are separated in payload
+            unset($payload['orderId']);
         }
 
         $payment = $order->getPayment();
 
         // Init payments/details request
         $result = [];
 
-        if ($paymentData = $payment->getAdditionalInformation("threeDS2PaymentData")) {
+        if ($paymentData = $payment->getAdditionalInformation("adyenPaymentData")) {
             // Add payment data into the request object
             $request = [
-                "paymentData" => $payment->getAdditionalInformation("threeDS2PaymentData")
+                "paymentData" => $paymentData
             ];
 
             // unset payment data from additional information
-            $payment->unsAdditionalInformation("threeDS2PaymentData");
+            $payment->unsAdditionalInformation("adyenPaymentData");
         } else {
             $this->adyenLogger->error("3D secure 2.0 failed, payment data not found");
             throw new \Magento\Framework\Exception\LocalizedException(
@@ -119,8 +121,11 @@ public function initiate($payload)
             $request['details']['threeds2.fingerprint'] = $payload['details']['threeds2.fingerprint'];
         } elseif (!empty($payload['details']['threeds2.challengeResult'])) {
             $request['details']['threeds2.challengeResult'] = $payload['details']['threeds2.challengeResult'];
+        } elseif (!empty($payload)) {
+            $request = $payload;
         }
 
+
         // Send the request
         try {
             $client = $this->adyenHelper->initializeAdyenClient($order->getStoreId());
@@ -161,6 +166,12 @@ public function initiate($payload)
 
             $order->cancel()->save();
 
+            $this->adyenLogger->error(
+                sprintf("Payment details call failed for action or 3ds2 payment method, resultcode is %s Raw API responds: %s",
+                    $result['resultCode'],
+                    print_r($result, true)
+                ));
+
             throw new \Magento\Framework\Exception\LocalizedException(__('The payment is REFUSED.'));
         }
 

Model/AdyenThreeDS2Process.php

@@ -157,10 +157,6 @@ public function getConfig()
         $config['payment']['adyenCc']['canCreateBillingAgreement'] = $canCreateBillingAgreement;
         $config['payment']['adyenCc']['icons'] = $this->getIcons();
 
-        $config['payment']['adyenCc']['originKey'] = $this->_adyenHelper->getOriginKeyForBaseUrl();
-        $config['payment']['adyenCc']['checkoutEnvironment'] = $this->_adyenHelper->getCheckoutEnvironment(
-            $this->storeManager->getStore()->getId()
-        );
 
         // has installments by default false
         $config['payment']['adyenCc']['hasInstallments'] = false;

Model/Ui/AdyenCcConfigProvider.php

@@ -32,7 +32,7 @@ class AdyenGenericConfigProvider implements ConfigProviderInterface
     /**
      * @var \Adyen\Payment\Helper\Data
      */
-    protected $_adyenHelper;
+    protected $adyenHelper;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
@@ -48,7 +48,7 @@ public function __construct(
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
-        $this->_adyenHelper = $adyenHelper;
+        $this->adyenHelper = $adyenHelper;
         $this->storeManager = $storeManager;
     }
 
@@ -63,36 +63,26 @@ public function getConfig()
             'payment' => []
         ];
         // show logos turned on by default
-        if ($this->_showLogos()) {
+        if ($this->showLogos()) {
             $config['payment']['adyen']['showLogo'] = true;
         } else {
             $config['payment']['adyen']['showLogo'] = false;
         }
 
-        $config['payment']['checkoutCardComponentSource'] = $this->_adyenHelper->getCheckoutCardComponentJs(
+        $config['payment']['adyen']['originKey'] = $this->adyenHelper->getOriginKeyForBaseUrl();
+        $config['payment']['adyen']['checkoutEnvironment'] = $this->adyenHelper->getCheckoutEnvironment(
             $this->storeManager->getStore()->getId()
         );
 
         return $config;
     }
 
-    /**
-     * Return redirect URL for method
-     *
-     * @param string $code
-     * @return mixed
-     */
-    protected function getMethodRedirectUrl($code)
-    {
-        return $this->_methods[$code]->getCheckoutRedirectUrl();
-    }
-
     /**
      * @return bool
      */
-    protected function _showLogos()
+    protected function showLogos()
     {
-        $showLogos = $this->_adyenHelper->getAdyenAbstractConfigData('title_renderer');
+        $showLogos = $this->adyenHelper->getAdyenAbstractConfigData('title_renderer');
         if ($showLogos == \Adyen\Payment\Model\Config\Source\RenderMode::MODE_TITLE_IMAGE) {
             return true;
         }

Model/Ui/AdyenGenericConfigProvider.php

@@ -144,10 +144,6 @@ public function getConfig()
         );
 
         $config['payment']['adyenOneclick']['methodCode'] = self::CODE;
-        $config['payment']['adyenOneclick']['originKey'] = $this->_adyenHelper->getOriginKeyForBaseUrl();
-        $config['payment']['adyenOneclick']['checkoutEnvironment'] = $this->_adyenHelper->getCheckoutEnvironment(
-            $this->_storeManager->getStore()->getId()
-        );
         $config['payment']['adyenOneclick']['locale'] = $this->_adyenHelper->getStoreLocale(
             $this->_storeManager->getStore()->getId()
         );

Model/Ui/AdyenOneclickConfigProvider.php

@@ -11,5 +11,10 @@ var config = {
                 'Magento_CheckoutAgreements/js/model/place-order-mixin': true
             }
         }
+    },
+    map: {
+        '*': {
+            'adyenCheckout':  'https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/3.4.0/adyen.js'
+        }
     }
 };

view/base/web/images/logos/swish.png

@@ -64,29 +64,18 @@ define(
         /** Add view logic here if needed */
         return Component.extend({
             initialize: function () {
-                var self = this;
                 this._super();
 
-                // include checkout card component javascript
-                var checkoutCardComponentScriptTag = document.createElement('script');
-                checkoutCardComponentScriptTag.id = "AdyenCheckoutCardComponentScript";
-                checkoutCardComponentScriptTag.src = self.getCheckoutCardComponentSource();
-                checkoutCardComponentScriptTag.type = "text/javascript";
-                document.head.appendChild(checkoutCardComponentScriptTag);
-
                 if (this.isGooglePayEnabled()) {
                     var googlepayscript = document.createElement('script');
                     googlepayscript.src = "https://pay.google.com/gp/p/js/pay.js";
                     googlepayscript.type = "text/javascript";
                     document.head.appendChild(googlepayscript);
                 }
             },
-            getCheckoutCardComponentSource: function () {
-                return window.checkoutConfig.payment.checkoutCardComponentSource;
-            },
             isGooglePayEnabled: function () {
                 return window.checkoutConfig.payment.adyenGooglePay.active;
             }
         });
     }
-);
+);