PW-8077 Resolve conflicts and merge the Apple Pay Toklenisation branch

jest/sfccCartridgeMocks.js

@@ -215,6 +215,7 @@ jest.mock('*/cartridge/scripts/util/adyenHelper', () => ({
       getValueOrNull: jest.fn(() => 1000),
     })),
     isAdyenGivingAvailable: jest.fn(() => true),
+    isApplePay: jest.fn(() => true),
     getAdyenGivingConfig: jest.fn(() => true),
     isOpenInvoiceMethod: jest.fn(() => false),
     getDonationAmounts: jest.fn(() => [10, 20, 30]),
@@ -246,6 +247,7 @@ jest.mock('*/cartridge/scripts/util/adyenConfigs', () => {
   return {
     getAdyenEnvironment: jest.fn(() => 'TEST'),
     getCreditCardInstallments: jest.fn(() => true),
+    getAdyenApplePayTokenisationEnabled: jest.fn(() => true),
     getAdyenClientKey: jest.fn(() => 'mocked_client_key'),
     getGoogleMerchantID: jest.fn(() => 'mocked_google_merchant_id'),
     getAdyenCardholderNameEnabled: jest.fn(() => true),

metadata/site_import/meta/system-objecttype-extensions.xml

@@ -370,6 +370,14 @@
                 <externally-managed-flag>false</externally-managed-flag>
                 <default-value>false</default-value>
             </attribute-definition>
+            <attribute-definition attribute-id="AdyenApplePayTokenisationEnabled">
+                <display-name xml:lang="x-default">Tokenize Apple Pay payments</display-name>
+                <description xml:lang="x-default">Tokenize payment details for Apple Pay</description>
+                <type>boolean</type>
+                <mandatory-flag>false</mandatory-flag>
+                <externally-managed-flag>false</externally-managed-flag>
+                <default-value>false</default-value>
+            </attribute-definition>
             <attribute-definition attribute-id="AdyenCreditCardInstallments">
                 <display-name xml:lang="x-default">Credit Card Installments</display-name>
                 <description xml:lang="x-default">If installments are required please create the configuration value using this link: https://adyen.github.io/adyen-salesforce-commerce-cloud</description>
@@ -631,6 +639,7 @@
                 <attribute attribute-id="Adyen_IntegratorName"/>
                 <attribute attribute-id="Adyen_StoreId"/>
                 <attribute attribute-id="AdyenOneClickEnabled"/>
+                <attribute attribute-id="AdyenApplePayTokenisationEnabled"/>
                 <attribute attribute-id="AdyenCreditCardInstallments"/>
                 <attribute attribute-id="AdyenBasketFieldsEnabled"/>
                 <attribute attribute-id="AdyenLevel23DataEnabled"/>

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyen_checkout/checkoutConfiguration.js

@@ -267,6 +267,16 @@ function getAmazonpayConfig() {
   };
 }
 
+function getApplePayConfig() {
+  return {
+    showPayButton: true,
+    onSubmit: (state, component) => {
+      helpers.assignPaymentMethodValue();
+      helpers.paymentFromComponent(state.data, component);
+    },
+  };
+}
+
 function setCheckoutConfiguration() {
   store.checkoutConfiguration.onChange = handleOnChange;
   store.checkoutConfiguration.onAdditionalDetails = handleOnAdditionalDetails;
@@ -287,6 +297,7 @@ function setCheckoutConfiguration() {
     paypal: getPaypalConfig(),
     amazonpay: getAmazonpayConfig(),
     giftcard: getGiftCardConfig(),
+    applepay: getApplePayConfig(),
   };
 }
 

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyen_checkout/helpers.js

@@ -37,11 +37,12 @@ function paymentFromComponent(data, component = {}) {
     },
     success(response) {
       setOrderFormData(response);
-
       if (response.fullResponse?.action) {
         component.handleAction(response.fullResponse.action);
-      }
-      if (response.paymentError || response.error) {
+      } else if (response.isApplePay) {
+        document.querySelector('#result').value = JSON.stringify(response);
+        document.querySelector('#showConfirmationForm').submit();
+      } else if (response.paymentError || response.error) {
         component.handleError();
       }
     },
@@ -97,7 +98,9 @@ function displaySelectedMethod(type) {
   resetPaymentMethod();
 
   document.querySelector('button[value="submit-payment"]').disabled =
-    ['paypal', 'paywithgoogle', 'googlepay', 'amazonpay'].indexOf(type) > -1;
+    ['paypal', 'paywithgoogle', 'googlepay', 'amazonpay', 'applepay'].indexOf(
+      type,
+    ) > -1;
 
   document
     .querySelector(`#component_${type}`)

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/amazonPayCheckout.js

@@ -44,6 +44,7 @@ function paymentFromComponent(data, component) {
     },
     success(response) {
       helpers.setOrderFormData(response);
+
       handleAmazonResponse(response, component);
     },
   });

src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/__tests__/__snapshots__/paymentFromComponent.test.js.snap

@@ -14,6 +14,7 @@ exports[`Payment from Component should return json response 1`] = `
 [
   [
     {
+      "isApplePay": true,
       "orderNo": "mocked_orderNo",
       "orderToken": "mocked_orderToken",
       "resultCode": "Authorised",

src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/partialPayment.js

@@ -6,6 +6,13 @@ const AdyenConfigs = require('*/cartridge/scripts/util/adyenConfigs');
 const adyenCheckout = require('*/cartridge/scripts/adyenCheckout');
 const AdyenHelper = require('*/cartridge/scripts/util/adyenHelper');
 const AdyenLogs = require('*/cartridge/scripts/adyenCustomLogs');
+const constants = require('*/cartridge/adyenConstants/constants');
+
+function responseContainsErrors(response) {
+  return (
+    response.error || response.resultCode !== constants.RESULTCODES.AUTHORISED
+  );
+}
 
 function makePartialPayment(req, res, next) {
   try {
@@ -32,6 +39,14 @@ function makePartialPayment(req, res, next) {
       partialPaymentRequest,
     ); // no order created yet and no PI needed (for giftcards it will be created on Order level)
 
+    if (responseContainsErrors) {
+      let errorMsg = 'partial payment request did not go through';
+      errorMsg += response.resultCode
+        ? `.. resultCode: ${response.resultCode}`
+        : '';
+      throw new Error(errorMsg);
+    }
+
     Transaction.wrap(() => {
       session.privacy.giftCardResponse = JSON.stringify({
         giftCardpspReference: response.pspReference,

src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/paymentFromComponent.js

@@ -157,7 +157,13 @@ function handleRefusedResultCode(result, reqDataObj, order) {
 }
 
 function isExpressPayment(reqDataObj) {
-  return reqDataObj.paymentType === 'express'; // applepay
+  return reqDataObj.paymentType === 'express';
+}
+
+function handleExpressPayment(reqDataObj, currentBasket) {
+  if (isExpressPayment(reqDataObj)) {
+    setBillingAndShippingAddress(reqDataObj, currentBasket);
+  }
 }
 
 /**
@@ -201,9 +207,7 @@ function paymentFromComponent(req, res, next) {
     ] = req.form.paymentMethod.toLowerCase();
   });
 
-  if (isExpressPayment(reqDataObj)) {
-    setBillingAndShippingAddress(reqDataObj, currentBasket);
-  }
+  handleExpressPayment(reqDataObj, currentBasket);
 
   const order = COHelpers.createOrder(currentBasket);
 
@@ -225,6 +229,9 @@ function paymentFromComponent(req, res, next) {
   if (session.privacy.giftCardResponse) {
     handleGiftCardPayment(currentBasket, order);
   }
+  if (AdyenHelper.isApplePay(reqDataObj.paymentMethod?.type)) {
+    result.isApplePay = true;
+  }
 
   result.orderNo = order.orderNo;
   result.orderToken = order.orderToken;

src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/showConfirmationPaymentFromComponent/payment.js

@@ -13,7 +13,8 @@ const constants = require('*/cartridge/adyenConstants/constants');
 const { clearForms } = require('*/cartridge/controllers/utils/index');
 const AdyenLogs = require('*/cartridge/scripts/adyenCustomLogs');
 
-function handlePaymentError(order, { res, next }) {
+function handlePaymentError(order, adyenPaymentInstrument, { res, next }) {
+  clearForms.clearAdyenData(adyenPaymentInstrument);
   Transaction.wrap(() => {
     OrderMgr.failOrder(order, true);
   });
@@ -54,7 +55,7 @@ function handleAuthorisedPayment(
   // Places the order
   const placeOrderResult = COHelpers.placeOrder(order, fraudDetectionStatus);
   if (placeOrderResult.error) {
-    return handlePaymentError(order, { res, next });
+    return handlePaymentError(order, adyenPaymentInstrument, { res, next });
   }
 
   const currentLocale = Locale.getLocale(req.locale.id);
@@ -68,6 +69,7 @@ function handleAuthorisedPayment(
     AdyenHelper.savePaymentDetails(adyenPaymentInstrument, order, result);
   });
 
+  clearForms.clearAdyenData(adyenPaymentInstrument);
   clearForms.clearForms();
   // determines SFRA version for backwards compatibility
   if (AdyenConfigs.getAdyenSFRA6Compatibility() === true) {
@@ -89,15 +91,42 @@ function handleAuthorisedPayment(
   return next();
 }
 
+function handlePaymentResult(result, order, adyenPaymentInstrument, options) {
+  // Authorised: The payment authorisation was successfully completed.
+  if (
+    [
+      constants.RESULTCODES.AUTHORISED,
+      constants.RESULTCODES.PENDING,
+      constants.RESULTCODES.RECEIVED,
+    ].indexOf(result.resultCode) > -1
+  ) {
+    return handleAuthorisedPayment(
+      order,
+      result,
+      adyenPaymentInstrument,
+      options,
+    );
+  }
+  return handlePaymentError(order, adyenPaymentInstrument, options);
+}
+
 // eslint-disable-next-line complexity
 function handlePayment(stateData, order, options) {
   const paymentInstruments = order.getPaymentInstruments(
     AdyenHelper.getOrderMainPaymentInstrumentType(order),
   );
   const result = options.req.form?.result;
+
   const adyenPaymentInstrument = paymentInstruments[0];
   const hasStateData = stateData?.paymentData && stateData?.details;
 
+  if (result?.error || order.status.value === Order.ORDER_STATUS_FAILED) {
+    AdyenLogs.error_log(
+      `Could not call payment/details for order ${order.orderNo}`,
+    );
+    return handlePaymentError(order, adyenPaymentInstrument, options);
+  }
+
   let finalResult;
   if (!hasStateData) {
     if (
@@ -107,17 +136,10 @@ function handlePayment(stateData, order, options) {
     ) {
       finalResult = JSON.parse(result);
     } else {
-      return handlePaymentError(order, options);
+      return handlePaymentError(order, adyenPaymentInstrument, options);
     }
   }
 
-  if (order.status.value === Order.ORDER_STATUS_FAILED) {
-    AdyenLogs.error_log(
-      `Could not call payment/details for failed order ${order.orderNo}`,
-    );
-    return handlePaymentError(order, options);
-  }
-
   const detailsCall = hasStateData
     ? handlePaymentsDetailsCall(stateData, adyenPaymentInstrument)
     : null;
@@ -127,22 +149,12 @@ function handlePayment(stateData, order, options) {
   });
   finalResult = finalResult || detailsCall?.result;
 
-  // Authorised: The payment authorisation was successfully completed.
-  if (
-    [
-      constants.RESULTCODES.AUTHORISED,
-      constants.RESULTCODES.PENDING,
-      constants.RESULTCODES.RECEIVED,
-    ].indexOf(finalResult.resultCode) > -1
-  ) {
-    return handleAuthorisedPayment(
-      order,
-      finalResult,
-      adyenPaymentInstrument,
-      options,
-    );
-  }
-  return handlePaymentError(order, options);
+  return handlePaymentResult(
+    finalResult,
+    order,
+    adyenPaymentInstrument,
+    options,
+  );
 }
 
 module.exports = handlePayment;

src/cartridges/int_adyen_overlay/cartridge/adyenConstants/constants.js

@@ -24,6 +24,11 @@ module.exports = {
   },
   CHECKOUT_COMPONENT_IMAGE_URL_PATH: 'images/logos/medium/',
 
+    PAYMENTMETHODS: {
+      APPLEPAY: 'applepay',
+      AMAZONPAY: 'amazonpay',
+    },
+
   SERVICE: {
     PAYMENT: 'AdyenPayment',
     PAYMENTDETAILS: 'AdyenPaymentDetails',

src/cartridges/int_adyen_overlay/cartridge/scripts/adyenCheckout.js

@@ -155,6 +155,10 @@ function createPaymentRequest(args) {
       }
     }
 
+    //Set Apple Pay tokenisation
+    if (AdyenConfigs.getAdyenApplePayTokenisationEnabled() && AdyenHelper.isApplePay(paymentRequest.paymentMethod.type)) {
+          paymentRequest.storePaymentMethod = true;
+    }
     setPaymentTransactionType(paymentInstrument, paymentRequest.paymentMethod);
 
     // make API call

src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenConfigs.js

@@ -85,6 +85,14 @@ const adyenConfigsObj = {
     return getCustomPreference('Adyen_Frontend_Region').value;
   },
 
+  getAdyenApplePayTokenisationEnabled: function () {
+    return getCustomPreference('AdyenApplePayTokenisationEnabled');
+  },
+
+  getAdyenSalePaymentMethods: function () {
+    return getCustomPreference('AdyenSalePaymentMethods') ? getCustomPreference('AdyenSalePaymentMethods').toString().split(',') : '';
+  },
+
   getAdyenBasketFieldsEnabled() {
     return getCustomPreference('AdyenBasketFieldsEnabled');
   },

src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenHelper.js

@@ -604,34 +604,42 @@ var adyenHelperObj = {
     if (!empty(cardType)) {
       switch (cardType) {
         case 'visa':
+        case 'visa_applepay':
           cardType = 'Visa';
           break;
         case 'mc':
+        case 'mc_applepay':
           cardType = 'Mastercard';
           break;
         case 'amex':
+        case 'amex_applepay':
           cardType = 'Amex';
           break;
         case 'discover':
+        case 'discover_applepay':
           cardType = 'Discover';
           break;
         case 'maestro':
         case 'maestrouk':
+        case 'maestro_applepay':
           cardType = 'Maestro';
           break;
         case 'diners':
+        case 'diners_applepay':
           cardType = 'Diners';
           break;
         case 'bcmc':
           cardType = 'Bancontact';
           break;
         case 'jcb':
+        case 'jcb_applepay':
           cardType = 'JCB';
           break;
         case 'cup':
           cardType = 'CUP';
           break;
         case 'cartebancaire':
+        case 'cartebancaire_applepay':
           cardType = 'Carte Bancaire';
           break;
         default:
@@ -752,6 +760,10 @@ var adyenHelperObj = {
     return applicationInfo;
   },
 
+    isApplePay(paymentMethod) {
+      return paymentMethod === constants.PAYMENTMETHODS.APPLEPAY;
+    },
+
   // validates all fields in a state data object. Filters out all invalid fields
   validateStateData(stateData) {
     const validFields = [