@rnw-community/react-native-payments 0.54.6 → 0.54.8

package/ios/Payments.xcodeproj/xcuserdata/vitaliiyehorov.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Payments.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rnw-community/react-native-payments",
-    "version": "0.54.6",
+    "version": "0.54.8",
     "description": "React Native Payments",
     "keywords": [
         "react",
@@ -71,7 +71,7 @@
         "build:android": "cd example/android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
         "build:ios": "cd example/ios && xcodebuild -workspace PaymentsExample.xcworkspace -scheme PaymentsExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
     },
-    "gitHead": "56e39993dda44994d93eed59b8dd39fa1cf17d17",
+    "gitHead": "c8e4076a7be7e481b55df74210c05b6baa8024cf",
     "dependencies": {
         "react-native-uuid": "^2.0.1",
         "validator": "^13.9.0"

package/readme.md

@@ -78,6 +78,8 @@ dependencies {
     implementation 'com.google.android.gms:play-services-wallet:19.2.0'
 ```
 
+- Your google account that are you using for testing should be added to [Google Pay API Test Cards Allowlist](https://groups.google.com/g/googlepay-test-mode-stub-data?pli=1)
+
 ## Usage
 
 Detailed guide should be found at:
@@ -174,17 +176,29 @@ including the payment method used, the payer's information, and transaction-rela
 
 ```ts
 const paymentResponse = paymentRequest.show().then((paymentResponse) => {
-    // This field will have all plaform related information needed for transaction processing
-    paymentDetails.details;
+    // This field will have all Android payment token info AndroidPaymentMethodToken
+    paymentDetails.details.AndroidPay;
+    // This field will have all IOS payment token info IosPKToken
+    paymentDetails.details.ApplePay;
     // Aditionally if was requested, shipping, billing and payer info would be available
     paymentDetails.billingAddress;
     paymentDetails.payerEmail;
     paymentDetails.payerName;
     paymentDetails.payerPhone;
     paymentDetails.shippingAddress;
+    // Send data to your BE
+    // Close paymnet sheet
 }).catch(...);
 ```
 
+The `PaymentResponseDetailsInterface` includes the following additional properties:
+
+- `billingAddress`: This property represents user billing details `PaymentResponseAddressInterface` and available if was requested in the `PaymentRequest`.
+- `shippingAddress`: This property represents user shipping details `PaymentResponseAddressInterface` and available if was requested in the `PaymentRequest`.
+- `payerEmail`: This property represents user email and available if was requested in the `PaymentRequest`.
+- `payerPhone`: This property represents user phone and available if was requested in the `PaymentRequest`.
+- `details`: This property represents PaymentToken information returned by `ApplePay` or `AndroidPay`, this should be sent to your payment provider.
+
 ### 6. Closing the Payment Sheet
 
 Once the payment process is successfully completed, it's essential to close the payment sheet by calling the

package/src/@standard/android/response/android-intermediate-signing-key.ts

@@ -1,3 +1,5 @@
+import { emptyAndroidSignedKey } from './android-signed-key';
+
 import type { AndroidSignedKey } from './android-signed-key';
 
 // https://developers.google.com/pay/api/android/guides/resources/payment-data-cryptography#intermediate-signing-key
@@ -5,3 +7,8 @@ export interface AndroidIntermediateSigningKey {
     signatures: string;
     signedKey: AndroidSignedKey;
 }
+
+export const emptyAndroidIntermediateSigningKey: AndroidIntermediateSigningKey = {
+    signatures: '',
+    signedKey: emptyAndroidSignedKey,
+};

package/src/@standard/android/response/android-payment-method-token.ts

@@ -1,3 +1,6 @@
+import { emptyAndroidIntermediateSigningKey } from './android-intermediate-signing-key';
+import { emptyAndroidSignedMessage } from './android-signed-message';
+
 import type { AndroidIntermediateSigningKey } from './android-intermediate-signing-key';
 import type { AndroidSignedMessage } from './android-signed-message';
 
@@ -7,3 +10,10 @@ export interface AndroidPaymentMethodToken {
     signature: string;
     signedMessage: AndroidSignedMessage;
 }
+
+export const emptyAndroidPaymentMethodToken: AndroidPaymentMethodToken = {
+    intermediateSigningKey: emptyAndroidIntermediateSigningKey,
+    protocolVersion: '',
+    signature: '',
+    signedMessage: emptyAndroidSignedMessage,
+};

package/src/@standard/android/response/android-signed-key.ts

@@ -3,3 +3,8 @@ export interface AndroidSignedKey {
     keyExpiration: string;
     keyValue: string;
 }
+
+export const emptyAndroidSignedKey: AndroidSignedKey = {
+    keyExpiration: '',
+    keyValue: '',
+};

package/src/@standard/android/response/android-signed-message.ts

@@ -5,3 +5,9 @@ export interface AndroidSignedMessage {
     ephemeralPublicKey: string;
     tag: string;
 }
+
+export const emptyAndroidSignedMessage: AndroidSignedMessage = {
+    encryptedMessage: '',
+    ephemeralPublicKey: '',
+    tag: '',
+};

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

@@ -11,3 +11,13 @@ export interface IosPKToken {
     };
     transactionIdentifier: string;
 }
+
+export const emptyIosPKToken: IosPKToken = {
+    paymentData: '',
+    paymentMethod: {
+        displayName: '',
+        network: '',
+        type: '',
+    },
+    transactionIdentifier: '',
+};

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,16 @@ 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),
+            details: {
+                AndroidPay: AndroidPaymentResponse.parseToken(data.paymentMethodData.tokenizationData.token),
+                ApplePay: emptyIosPKToken,
+            },
             payerEmail: data.email,
             ...(isDefined(data.shippingAddress) && {
                 payerName: (data.shippingAddress as AndroidMinAddress).name,
@@ -33,32 +40,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,25 @@
 import { isNotEmptyString } from '@rnw-community/shared';
 
+import { emptyAndroidPaymentMethodToken } from '../../@standard/android/response/android-payment-method-token';
+
 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 { IosPKPayment } from '../../@standard/ios/response/ios-pk-payment';
-import type { IosPKToken } from '../../@standard/ios/response/ios-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,
+            details: {
+                ApplePay: data.token,
+                AndroidPay: emptyAndroidPaymentMethodToken,
+            },
             payerEmail: data.shippingContact?.emailAddress ?? '',
             payerName: IosPaymentResponse.parseNSPersonNameComponents(data.shippingContact?.name),
             payerPhone: IosPaymentResponse.parseCNPhoneNumber(data.shippingContact?.phoneNumber),

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,13 @@
 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 {
     billingAddress?: PaymentResponseAddressInterface;
-    // TODO: Add IOS
-    details: TokenDetails;
+    details: {
+        AndroidPay: AndroidPaymentMethodToken;
+        ApplePay: IosPKToken;
+    };
     payerEmail?: string;
     payerName?: string;
     payerPhone?: string;