untested applepay address format

Adyen · Dec 12, 2023 · 077870f · 077870f
1 parent a96dc2a
commit 077870f
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 3 deletions.
diff --git a/packages/lib/src/components/ApplePay/ApplePay.tsx b/packages/lib/src/components/ApplePay/ApplePay.tsx
@@ -7,7 +7,7 @@ import defaultProps from './defaultProps';
 import { httpPost } from '../../core/Services/http';
 import { APPLEPAY_SESSION_ENDPOINT } from './config';
 import { preparePaymentRequest } from './payment-request';
-import { resolveSupportedVersion, mapBrands } from './utils';
+import { resolveSupportedVersion, mapBrands, formatApplePayContactToAdyenAddressFormat } from './utils';
 import {
     ApplePayConfiguration,
     ApplePayElementData,
@@ -53,10 +53,14 @@ class ApplePayElement extends UIElement<ApplePayConfiguration> {
      * Formats the component data output
      */
     protected formatData(): ApplePayElementData {
+        const { applePayToken, billingAddress, shippingAddress } = this.state;
+
         return {
             paymentMethod: {
                 type: ApplePayElement.type,
-                applePayToken: this.state.applePayToken
+                applePayToken,
+                ...(billingAddress && { billingAddress }),
+                ...(shippingAddress && { shippingAddress })
             }
         };
     }
@@ -96,9 +100,14 @@ class ApplePayElement extends UIElement<ApplePayConfiguration> {
             onShippingContactSelected,
             onValidateMerchant: onValidateMerchant || this.validateMerchant,
             onPaymentAuthorized: (resolve, reject, event) => {
+                const billingAddress = formatApplePayContactToAdyenAddressFormat(event.payment.billingContact);
+                const shippingAddress = formatApplePayContactToAdyenAddressFormat(event.payment.shippingContact);
+
                 this.setState({
                     applePayToken: btoa(JSON.stringify(event.payment.token.paymentData)),
-                    authorizedEvent: event
+                    authorizedEvent: event,
+                    ...(billingAddress && { billingAddress }),
+                    ...(shippingAddress && { shippingAddress })
                 });
 
                 this.makePaymentsCall()

diff --git a/packages/lib/src/components/ApplePay/types.ts b/packages/lib/src/components/ApplePay/types.ts
@@ -1,4 +1,6 @@
 import { UIElementProps } from '../internal/UIElement/types';
+import { AddressSchema } from '../internal/Address/types';
+import { AddressData } from '../../types/global-types';
 
 declare global {
     interface Window {
@@ -198,6 +200,8 @@ export interface ApplePayElementData {
     paymentMethod: {
         type: string;
         applePayToken: string;
+        billingAddress?: AddressData;
+        shippingAddress?: AddressData;
     };
 }
 

diff --git a/packages/lib/src/components/ApplePay/utils.ts b/packages/lib/src/components/ApplePay/utils.ts
@@ -1,3 +1,5 @@
+import { AddressData } from '../../types/global-types';
+
 export function resolveSupportedVersion(latestVersion: number): number | null {
     const versions = [];
     for (let i = latestVersion; i > 0; i--) {
@@ -36,3 +38,48 @@ export function mapBrands(brands) {
         return accumulator;
     }, []);
 }
+
+/**
+ * ApplePay formats address into two lines (US format). First line includes house number and street name.
+ * Second line includes unit/suite/apartment number if applicable.
+ * This function formats it into Adyen's Address format (house number separate from street).
+ */
+export function formatApplePayContactToAdyenAddressFormat(
+    paymentContact: ApplePayJS.ApplePayPaymentContact
+): AddressData | undefined {
+    if (!paymentContact) {
+        return;
+    }
+
+    let street = '';
+    let houseNumberOrName = '';
+    if (paymentContact.addressLines && paymentContact.addressLines.length) {
+        const splitAddress = splitAddressLine(paymentContact.addressLines[0]);
+        street = splitAddress.streetAddress;
+        houseNumberOrName = splitAddress.houseNumber;
+    }
+
+    if (paymentContact.addressLines && paymentContact.addressLines.length > 1) {
+        street += ` ${paymentContact.addressLines[1]}`;
+    }
+
+    return {
+        city: paymentContact.locality,
+        country: paymentContact.countryCode,
+        houseNumberOrName,
+        postalCode: paymentContact.postalCode,
+        stateOrProvince: paymentContact.administrativeArea,
+        street: street
+    };
+}
+
+const splitAddressLine = (addressLine: string) => {
+    // The \d+ captures the digits of the house number, and \w* allows for any letter suffixes (like "123B")
+    // Everything after the space is considered the street address.
+    const parts = addressLine.match(/^(\d+\w*)\s+(.+)/);
+    if (parts) {
+        return { houseNumber: parts[1] || '', streetAddress: parts[2] || addressLine };
+    } else {
+        return { houseNumber: '', streetAddress: addressLine };
+    }
+};