Move all alternative payment methods to generic component (backend)

Gateway/Request/CheckoutDataBuilder.php

@@ -76,12 +76,6 @@ class CheckoutDataBuilder implements BuilderInterface
         $order->setCanSendNewEmailFlag(false);
 
         $componentStateData = $payment->getAdditionalInformation(AdyenCcDataAssignObserver::STATE_DATA);
-        $this->adyenHelper->adyenLogger->addAdyenDebug(json_encode($componentStateData));
-        $requestBody = array_merge($requestBody, $componentStateData);
-        $this->adyenHelper->adyenLogger->addAdyenDebug(json_encode($requestBody));
-        /*foreach ($componentStateData as $key => $data) {
-
-        }*/
 
         if (empty($requestBody['paymentMethod']['type']) && !empty(
             $payment->getAdditionalInformation(

Observer/AdyenCcDataAssignObserver.php

@@ -26,12 +26,15 @@ namespace Adyen\Payment\Observer;
 use Magento\Framework\Event\Observer;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Adyen\Payment\Observer\AdyenObserverTrait;
 
 /**
  * Class DataAssignObserver
  */
 class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
 {
+    use AdyenObserverTrait;
+
     //TODO do we need these?
     const VARIANT = 'variant';
 
@@ -110,24 +113,4 @@ class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
             $paymentInfo->setCcType($additionalData[self::CC_TYPE]);
         }
     }
-
-    /**
-     * Returns an array with only the approved keys
-     *
-     * @param array $array
-     * @param array $approvedKeys
-     * @return array
-     */
-    private function getArrayOnlyWithApprovedKeys($array, $approvedKeys)
-    {
-        $result = [];
-
-        foreach ($approvedKeys as $approvedKey) {
-            if (isset($array[$approvedKey])) {
-                $result[$approvedKey] = $array[$approvedKey];
-            }
-        }
-
-        return $result;
-    }
 }

Observer/AdyenHppDataAssignObserver.php

@@ -31,36 +31,36 @@ use Magento\Quote\Api\Data\PaymentInterface;
  */
 class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
 {
-    const BRAND_CODE = 'brand_code';
-    const ISSUER_ID = 'issuer_id';
-    const GENDER = 'gender';
-    const DOB = 'dob';
-    const TELEPHONE = 'telephone';
+    use AdyenObserverTrait;
+
+    // TODO do we need these?
     const DF_VALUE = 'df_value';
-    const SSN = 'ssn';
-	const OWNER_NAME = 'ownerName';
-    const BANK_ACCOUNT_OWNER_NAME = 'bankAccountOwnerName';
-	const IBAN_NUMBER = 'ibanNumber';
-    const BANK_ACCOUNT_NUMBER = 'bankAccountNumber';
-    const BANK_LOCATIONID = 'bankLocationId';
 
+    const BRAND_CODE = 'brand_code';
+    const STATE_DATA = 'state_data';
+    const BROWSER_INFO = 'browserInfo';
+    const PAYMENT_METHOD = 'paymentMethod';
+    const RISK_DATA = 'riskData';
 
     /**
+     * Approved root level keys from additional data array
+     *
      * @var array
      */
-    protected $additionalInformationList = [
-        self::BRAND_CODE,
-        self::ISSUER_ID,
-        self::GENDER,
-        self::DOB,
-        self::TELEPHONE,
-        self::DF_VALUE,
-        self::SSN,
-		self::OWNER_NAME,
-        self::BANK_ACCOUNT_OWNER_NAME,
-		self::IBAN_NUMBER,
-        self::BANK_ACCOUNT_NUMBER,
-        self::BANK_LOCATIONID
+    private static $approvedAdditionalDataKeys = [
+        self::STATE_DATA,
+        self::BRAND_CODE
+    ];
+
+    /**
+     * Approved root level keys from the checkout component's state data object
+     *
+     * @var array
+     */
+    private static $approvedStateDataKeys = [
+        self::BROWSER_INFO,
+        self::PAYMENT_METHOD,
+        self::RISK_DATA
     ];
 
     /**
@@ -69,26 +69,42 @@ class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
      */
     public function execute(Observer $observer)
     {
+        // Get request fields
         $data = $this->readDataArgument($observer);
 
+        // Get additional data array
         $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
         if (!is_array($additionalData)) {
             return;
         }
 
+        // Get a validated additional data array
+        $additionalData = $this->getArrayOnlyWithApprovedKeys($additionalData, self::$approvedAdditionalDataKeys);
+
+        // json decode state data
+        $stateData = [];
+        if (!empty($additionalData[self::STATE_DATA])) {
+            $stateData = json_decode($additionalData[self::STATE_DATA], true);
+        }
+
+        // Get validated state data array
+        if (!empty($stateData)) {
+            $stateData = $this->getArrayOnlyWithApprovedKeys($stateData, self::$approvedStateDataKeys);
+        }
+
+        // Replace state data with the decoded and validated state data
+        $additionalData[self::STATE_DATA] = $stateData;
+
+        // Set additional data in the payment
         $paymentInfo = $this->readPaymentModelArgument($observer);
-        
-        if (isset($additionalData[self::BRAND_CODE])) {
-            $paymentInfo->setCcType($additionalData[self::BRAND_CODE]);
+        foreach ($additionalData as $key => $data) {
+            $paymentInfo->setAdditionalInformation($key, $data);
         }
 
-        foreach ($this->additionalInformationList as $additionalInformationKey) {
-            if (isset($additionalData[$additionalInformationKey])) {
-                $paymentInfo->setAdditionalInformation(
-                    $additionalInformationKey,
-                    $additionalData[$additionalInformationKey]
-                );
-            }
+        // Is this the correct way of setting it???
+        // Set BrandCode into CCType
+        if (isset($additionalData[self::BRAND_CODE])) {
+            $paymentInfo->setCcType($additionalData[self::BRAND_CODE]);
         }
     }
 }

Observer/AdyenObserverTrait.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Observer;
+
+trait AdyenObserverTrait
+{
+    /**
+     * Returns an array with only the approved keys
+     *
+     * @param array $array
+     * @param array $approvedKeys
+     * @return array
+     */
+    private function getArrayOnlyWithApprovedKeys($array, $approvedKeys)
+    {
+        $result = [];
+
+        foreach ($approvedKeys as $approvedKey) {
+            if (isset($array[$approvedKey])) {
+                $result[$approvedKey] = $array[$approvedKey];
+            }
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file

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

@@ -246,11 +246,11 @@ define(
                 if (this.validate() && additionalValidators.validate()) {
 
                     var data = {};
-                    data.stateData = self.stateData;
                     data.method = self.method;
 
                     var additionalData = {};
                     additionalData.brand_code = self.brandCode;
+                    additionalData.state_data = JSON.stringify(self.stateData);
 
                     if (brandCode() == "ratepay") {
                         additionalData.df_value = this.getRatePayDeviceIdentToken();