@rnw-community/react-native-payments 0.54.7 → 0.54.9

package/src/@standard/ios/response/ios-raw-pk-token.ts

@@ -0,0 +1,14 @@
+// https://developer.apple.com/documentation/passkit/apple_pay/payment_token_format_reference?language=objc
+export interface IosRawPKToken {
+    /*
+     * https://developer.apple.com/documentation/passkit/pkpaymenttoken/1617000-paymentdata?language=objc
+     * Send this data to your e-commerce back-end system, where it can be decrypted and submitted to your payment processor.
+     */
+    paymentData: string;
+    paymentMethod: {
+        displayName: string;
+        network: string;
+        type: string;
+    };
+    transactionIdentifier: string;
+}

package/src/class/payment-response/android-payment-response.ts

@@ -1,5 +1,9 @@
 import { isDefined } from '@rnw-community/shared';
 
+import { emptyAndroidIntermediateSigningKey } from '../../@standard/android/response/android-intermediate-signing-key';
+import { emptyAndroidPaymentMethodToken } from '../../@standard/android/response/android-payment-method-token';
+import { emptyIosPKToken } from '../../@standard/ios/response/ios-pk-token';
+
 import { PaymentResponse } from './payment-response';
 
 import type { AndroidFullAddress } from '../../@standard/android/response/android-full-address';
@@ -11,13 +15,14 @@ import type { AndroidSignedKey } from '../../@standard/android/response/android-
 import type { AndroidSignedMessage } from '../../@standard/android/response/android-signed-message';
 import type { PaymentResponseAddressInterface } from '../../interface/payment-response-address.interface';
 
-export class AndroidPaymentResponse extends PaymentResponse<AndroidPaymentMethodToken> {
+export class AndroidPaymentResponse extends PaymentResponse {
     constructor(requestId: string, methodName: string, jsonData: string) {
         const data = JSON.parse(jsonData) as AndroidPaymentData;
 
         super(requestId, methodName, {
             billingAddress: AndroidPaymentResponse.parseFullAddress(data.paymentMethodData.info.billingAddress),
-            details: AndroidPaymentResponse.parseToken(data.paymentMethodData.tokenizationData.token),
+            androidPayToken: AndroidPaymentResponse.parseToken(data.paymentMethodData.tokenizationData.token),
+            applePayToken: emptyIosPKToken,
             payerEmail: data.email,
             ...(isDefined(data.shippingAddress) && {
                 payerName: (data.shippingAddress as AndroidMinAddress).name,
@@ -33,32 +38,21 @@ export class AndroidPaymentResponse extends PaymentResponse<AndroidPaymentMethod
 
     private static parseToken(input = '{}'): AndroidPaymentMethodToken {
         if (input === 'examplePaymentMethodToken') {
-            return {
-                intermediateSigningKey: {
-                    signatures: '',
-                    signedKey: {
-                        keyExpiration: '',
-                        keyValue: '',
-                    },
-                },
-                protocolVersion: '',
-                signature: '',
-                signedMessage: {
-                    encryptedMessage: '',
-                    ephemeralPublicKey: '',
-                    tag: '',
-                },
-            };
+            return emptyAndroidPaymentMethodToken;
         }
 
         const rawToken = JSON.parse(input) as AndroidRawPaymentMethodToken;
 
-        // TODO: If needed we can add parsing of rawToken.intermediateSigningKey
         return {
+            ...emptyAndroidPaymentMethodToken,
             ...rawToken,
             intermediateSigningKey: {
-                ...rawToken.intermediateSigningKey,
-                signedKey: JSON.parse(rawToken.intermediateSigningKey.signedKey) as AndroidSignedKey,
+                ...(isDefined(rawToken.intermediateSigningKey)
+                    ? {
+                          ...rawToken.intermediateSigningKey,
+                          signedKey: JSON.parse(rawToken.intermediateSigningKey.signedKey) as AndroidSignedKey,
+                      }
+                    : emptyAndroidIntermediateSigningKey),
             },
             signedMessage: JSON.parse(rawToken.signedMessage) as AndroidSignedMessage,
         };

package/src/class/payment-response/ios-payment-response.ts

@@ -1,21 +1,27 @@
 import { isNotEmptyString } from '@rnw-community/shared';
 
+import { emptyAndroidPaymentMethodToken } from '../../@standard/android/response/android-payment-method-token';
+import { emptyIosPaymentData } from '../../@standard/ios/response/ios-payment-data';
+
 import { PaymentResponse } from './payment-response';
 
 import type { IosCNPhoneNumber } from '../../@standard/ios/response/ios-cn-phone-number';
 import type { IosCNPostalAddress } from '../../@standard/ios/response/ios-cn-postal-address';
 import type { IosNSPersonNameComponents } from '../../@standard/ios/response/ios-ns-person-name-components';
+import type { IosPaymentData } from '../../@standard/ios/response/ios-payment-data';
 import type { IosPKPayment } from '../../@standard/ios/response/ios-pk-payment';
 import type { IosPKToken } from '../../@standard/ios/response/ios-pk-token';
+import type { IosRawPKToken } from '../../@standard/ios/response/ios-raw-pk-token';
 import type { PaymentResponseAddressInterface } from '../../interface/payment-response-address.interface';
 
-export class IosPaymentResponse extends PaymentResponse<IosPKToken> {
+export class IosPaymentResponse extends PaymentResponse {
     constructor(requestId: string, methodName: string, jsonData: string) {
         const data = JSON.parse(jsonData) as IosPKPayment;
 
         super(requestId, methodName, {
             billingAddress: IosPaymentResponse.parsePKContact(data.billingContact?.postalAddress),
-            details: data.token,
+            applePayToken: IosPaymentResponse.parsePkToken(data.token),
+            androidPayToken: emptyAndroidPaymentMethodToken,
             payerEmail: data.shippingContact?.emailAddress ?? '',
             payerName: IosPaymentResponse.parseNSPersonNameComponents(data.shippingContact?.name),
             payerPhone: IosPaymentResponse.parseCNPhoneNumber(data.shippingContact?.phoneNumber),
@@ -23,6 +29,15 @@ export class IosPaymentResponse extends PaymentResponse<IosPKToken> {
         });
     }
 
+    private static parsePkToken(input: IosRawPKToken): IosPKToken {
+        return {
+            ...input,
+            paymentData: isNotEmptyString(input.paymentData)
+                ? (JSON.parse(input.paymentData) as IosPaymentData)
+                : emptyIosPaymentData,
+        };
+    }
+
     // TODO: Validate if this mapping is correct
     private static parsePKContact(input?: IosCNPostalAddress): PaymentResponseAddressInterface {
         return {

package/src/class/payment-response/payment-response.ts

@@ -6,19 +6,17 @@ import type { PaymentResponseDetailsInterface } from '../../interface/payment-re
 
 /*
  * https://www.w3.org/TR/payment-request/#paymentresponse-interface
- * TODO: Many of fields and methods of this class does not correspond to the spec, should we change it?
  */
-export class PaymentResponse<TokenDetails> {
+export class PaymentResponse {
     private completeCalled = false;
 
-    // TODO: Should we extract type? Spec does not provide such data
     constructor(
         // https://www.w3.org/TR/payment-request/#dom-paymentresponse-requestid
         readonly requestId: string,
         // https://www.w3.org/TR/payment-request/#dom-paymentresponse-methodname
         readonly methodName: string,
         // https://www.w3.org/TR/payment-request/#dom-paymentresponse-details
-        readonly details: PaymentResponseDetailsInterface<TokenDetails>
+        readonly details: PaymentResponseDetailsInterface
     ) {}
 
     // https://www.w3.org/TR/payment-request/#complete-method

package/src/index.ts

@@ -6,10 +6,18 @@ export { SupportedNetworkEnum } from './enum/supported-networks.enum';
 
 export { IosPKMerchantCapability } from './@standard/ios/enum/ios-pk-merchant-capability.enum';
 
-export type { AndroidPaymentMethodDataInterface } from './@standard/android/mapping/android-payment-method-data.interface';
-export type { IosPaymentMethodDataInterface } from './@standard/ios/mapping/ios-payment-method-data.interface';
 export type { PaymentMethodData } from './@standard/w3c/payment-method-data';
 export type { PaymentDetailsInterface } from './interface/payment-details.interface';
 
+export type { AndroidPaymentMethodDataDataInterface } from './@standard/android/mapping/android-payment-method-data-data.interface';
+export type { AndroidPaymentMethodDataInterface } from './@standard/android/mapping/android-payment-method-data.interface';
+export type { AndroidPaymentMethodToken } from './@standard/android/response/android-payment-method-token';
+export { AndroidPaymentResponse } from './class/payment-response/android-payment-response';
+
+export type { IosPaymentMethodDataDataInterface } from './@standard/ios/mapping/ios-payment-method-data-data.interface';
+export type { IosPaymentMethodDataInterface } from './@standard/ios/mapping/ios-payment-method-data.interface';
+export type { IosPKToken } from './@standard/ios/response/ios-pk-token';
+export { IosPaymentResponse } from './class/payment-response/ios-payment-response';
+
 export { PaymentRequest } from './class/payment-request/payment-request';
 export { PaymentResponse } from './class/payment-response/payment-response';

package/src/interface/payment-response-details.interface.ts

@@ -1,9 +1,11 @@
 import type { PaymentResponseAddressInterface } from './payment-response-address.interface';
+import type { AndroidPaymentMethodToken } from '../@standard/android/response/android-payment-method-token';
+import type { IosPKToken } from '../@standard/ios/response/ios-pk-token';
 
-export interface PaymentResponseDetailsInterface<TokenDetails> {
+export interface PaymentResponseDetailsInterface {
+    androidPayToken: AndroidPaymentMethodToken;
+    applePayToken: IosPKToken;
     billingAddress?: PaymentResponseAddressInterface;
-    // TODO: Add IOS
-    details: TokenDetails;
     payerEmail?: string;
     payerName?: string;
     payerPhone?: string;