react-native-payengine 2.0.8 → 2.0.10

package/src/components/v2/ApplePay/PEApplePayButton.tsx

@@ -2,6 +2,7 @@
 import * as React from 'react';
 import { Platform, requireNativeComponent, Text, ViewProps } from 'react-native';
 import type { PEPaymentRequest } from '../PEPaymentRequest';
+import type { PEApplePayContact } from './PEApplePayContact';
 
 
 const RNPEApplePayButton = requireNativeComponent<NativePEApplePayViewProps>('RNPEApplePayButton');
@@ -9,7 +10,10 @@ const RNPEApplePayButton = requireNativeComponent<NativePEApplePayViewProps>('RN
 type NativePEApplePayEvent = {
   nativeEvent: {
     error?: string;
-    token?: string
+    token?: string;
+    metadata?: any;
+    billingContact?: string;
+    shippingContact?: string;
   };
 };
 
@@ -22,7 +26,7 @@ interface NativePEApplePayViewProps extends ViewProps {
 
 export interface PEApplePayButtonProps extends ViewProps {
   paymentRequest: PEPaymentRequest;
-  onTokenDidReturn?: (token: string) => void;
+  onTokenDidReturn?: (token: string, metadata?: any, billingContact?: PEApplePayContact, shippingContact?: PEApplePayContact) => void;
   onPaymentSheetDismissed?: () => void;
   onPaymentFailed?: (error: Error) => void;
 }
@@ -48,7 +52,13 @@ PEApplePayButtonMethods,
 
   const pmTokenDidReturn = (event: NativePEApplePayEvent) => {
     if (props.onTokenDidReturn) {
-      props.onTokenDidReturn(event.nativeEvent.token!);
+      const { token, metadata: metadataString, billingContact: billingContactString, shippingContact: shippingContactString } = event.nativeEvent;
+      console.log('ON token', token, metadataString, billingContactString, shippingContactString)
+      const metadata = metadataString ? JSON.parse(metadataString) : null;
+      const billingContact = billingContactString ? JSON.parse(billingContactString) as PEApplePayContact : null;
+      const shippingContact = shippingContactString ? JSON.parse(shippingContactString) as PEApplePayContact : null;
+
+      props.onTokenDidReturn(token!, metadata, billingContact ?? undefined, shippingContact ?? undefined);
     }
   };
 

package/src/components/v2/ApplePay/PEApplePayContact.ts

@@ -0,0 +1,14 @@
+export interface PEApplePayContact {
+  givenName?: string;
+  familyName?: string;
+  addressLines?: string[];
+  locality?: string;
+  administrativeArea?: string;
+  postalCode?: string;
+  country?: string;
+  countryCode?: string;
+  subAdministrativeArea?: string;
+  subLocality?: string;
+  emailAddress?: string;
+  phoneNumber?: string;
+}

package/src/components/v2/GooglePay/PEGooglePayAddress.ts

@@ -0,0 +1,11 @@
+export interface PEGooglePayAddress {
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  administrativeArea?: string;
+  countryCode?: string;
+  locality?: string;
+  name?: string;
+  phoneNumber?: string;
+  postalCode?: string;
+}

package/src/components/v2/GooglePay/PEGooglePayButton.tsx

@@ -2,6 +2,7 @@
 import * as React from 'react';
 import { NativeEventEmitter, NativeModules, Platform, requireNativeComponent, Text, ViewProps } from 'react-native';
 import type { PEPaymentRequest } from '../PEPaymentRequest';
+import type { PEGooglePayAddress } from './PEGooglePayAddress';
 
 const { RNPEEventEmitter } = NativeModules;
 
@@ -17,7 +18,7 @@ const peEventEmitter = new NativeEventEmitter(RNPEEventEmitter);
 
 export interface PEGooglePayButtonProps extends ViewProps {
   paymentRequest: PEPaymentRequest;
-  onTokenDidReturn?: (token: string) => void;
+  onTokenDidReturn?: (token: string, metadata?: any, billingAddress?: PEGooglePayAddress, shippingAddress?: PEGooglePayAddress) => void;
   onPaymentSheetDismissed?: () => void;
   onPaymentFailed?: (error: Error) => void;
 }
@@ -37,9 +38,13 @@ export const PEGooglePayButton = React.forwardRef<
 
   React.useEffect(() => {
     const listener1 = peEventEmitter.addListener('onGooglePayRespond', args => {
-      const { token } = args;
-      console.log('ON token', token)
-      props.onTokenDidReturn?.(token)
+      const { token, metadata: metadataString, billingAddress: billingAddressString, shippingAddress: shippingAddressString } = args;
+      console.log('ON token', token, metadataString, billingAddressString, shippingAddressString)
+      const metadata = metadataString ? JSON.parse(metadataString) : null;
+      const billingAddress = billingAddressString ? JSON.parse(billingAddressString) as PEGooglePayAddress : null;
+      const shippingAddress = shippingAddressString ? JSON.parse(shippingAddressString) as PEGooglePayAddress : null;
+
+      props.onTokenDidReturn?.(token, metadata, billingAddress ?? undefined, shippingAddress ?? undefined)
     });
 
     const listener2 = peEventEmitter.addListener('onGooglePayError', args => {

package/src/components/v2/PayEngineNative.tsx

@@ -1,4 +1,5 @@
 import { NativeModules, Platform } from "react-native";
+import { PayProvider } from "../../interfaces";
 
 const { RNPayEngineNative } = NativeModules;
 
@@ -11,11 +12,25 @@ export default class PayEngineNative {
     return RNPayEngineNative.getBrowserInfo();
   }
 
+  /**
+   * @deprecated use userCanPay instead
+   * @param merchantId 
+   * @returns 
+   */
   static async isPlatformPaySupported(merchantId: string) {
     if (Platform.OS === 'ios') {
       return await RNPayEngineNative.isApplePaySupported(merchantId);
     } else if (Platform.OS === 'android') {
-      return true
+      return await RNPayEngineNative.isGooglePaySupported(merchantId);
+    }
+    return false;
+  }
+
+  static async userCanPay(provider: PayProvider, merchantId: string) {
+    if (provider == PayProvider.applePay && Platform.OS == 'ios') {
+      return await RNPayEngineNative.isApplePaySupported(merchantId);
+    } else if (provider === PayProvider.googlePay && Platform.OS === 'android') {
+      return await RNPayEngineNative.isGooglePaySupported(merchantId);
     }
     return false;
   }

package/src/index.tsx

@@ -1,6 +1,7 @@
 import PayEngine from './components/PayEngine';
 import { NativeModules, Platform } from 'react-native';
 import type { IPayEngineConfig } from './interfaces/index';
+import { PayProvider } from './interfaces/index';
 import {
   PECreditCardView,
   PECreditCardViewMethods,
@@ -19,6 +20,8 @@ import { PEPaymentRequest, RNPEApplePayOptions, RNPEContactField, RNPEGooglePayB
 import { PEGooglePayButton } from './components/v2/GooglePay/PEGooglePayButton';
 import * as PayEngineUtils from './utils/index';
 import PEKeyboardType from './components/v2/SecureFields/PEKeyboardType';
+import type { PEGooglePayAddress } from './components/v2/GooglePay/PEGooglePayAddress';
+import type { PEApplePayContact } from './components/v2/ApplePay/PEApplePayContact';
 
 const LINKING_ERROR =
   `The package 'react-native-payengine' doesn't seem to be linked. Make sure: \n\n` +
@@ -41,7 +44,7 @@ export {
   PayEngineStatic,
   PayEngine,
   IPayEngineConfig,
-
+  PayProvider,
   // v2 starting here
   PayEngineUtils,
   PayEngineProvider,
@@ -61,9 +64,10 @@ export {
   PEApplePayButton,
   RNPEApplePayOptions, 
   RNPEContactField,
+  PEApplePayContact,
   RNPEGooglePayBillingAddressParameters, 
   RNPEGooglePayShippingAddressParameters,
   PEPaymentRequest,
   PEGooglePayButton,
-  
+  PEGooglePayAddress
 };

package/src/interfaces/index.ts

@@ -4,3 +4,8 @@ export interface IPayEngineConfig {
   scriptURL?: string;
   logLevel?: number;
 }
+
+export enum PayProvider {
+  googlePay,
+  applePay
+}