react-native-payengine 2.0.9 → 2.0.11

package/README.md

@@ -156,7 +156,8 @@ import {
   PEPaymentRequest,
   PayEngineNative,
   PayEngineUtils,
-  RNPEContactField
+  RNPEContactField,
+  PayProvider
 } from 'react-native-payengine';
 import axios from 'axios';
 
@@ -167,7 +168,7 @@ const ApplePayScreen = () => {
   React.useEffect(() => {
     const checkSupport = async () => {
       try {
-        const isSupported = await PayEngineNative.isPlatformPaySupported(
+        const isSupported = await PayEngineNative.userCanPay(PayProvider.applePay,
           MERCHANT_ID
         );
         console.log('isSupported', isSupported);
@@ -249,6 +250,7 @@ import {
   PEGooglePayButton,
   PEPaymentRequest,
   PayEngineNative,
+  PayProvider
 } from 'react-native-payengine';
 
 const GooglePayScreen = () => {
@@ -258,7 +260,7 @@ const GooglePayScreen = () => {
   React.useEffect(() => {
     const checkSupport = async () => {
       try {
-        const isSupported = await PayEngineNative.isPlatformPaySupported(
+        const isSupported = await PayEngineNative.userCanPay(PayProvider.googlePay,
           MERCHANT_ID
         );
         console.log('isSupported', isSupported);

package/android/build.gradle

@@ -164,8 +164,8 @@ dependencies {
 
   implementation files("./securefields-1.7.2-debug.aar")
 
-  debugImplementation files("./payment-sdk-debug-1.0.3.aar")
-  releaseImplementation files("./payment-sdk-debug-1.0.3.aar")
+  debugImplementation files("./payment-sdk-debug-1.0.4.aar")
+  releaseImplementation files("./payment-sdk-debug-1.0.4.aar")
 
   api 'com.github.Kount:kount-android-sdk:v4.3.2'
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'

package/android/src/main/java/com/reactnativepayengine/v2/RNPayEngineNative.kt

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
 import com.payengine.paymentsdk.PayEngine
 import com.payengine.paymentsdk.features.googlepay.PEGooglePayInterface
+import com.payengine.paymentsdk.features.googlepay.PEGooglePayStatus
 import com.payengine.paymentsdk.models.PEConfig
 import kotlin.concurrent.thread
 
@@ -66,6 +67,26 @@ class RNPayEngineNative: ReactContextBaseJavaModule {
     }
   }
 
+  @ReactMethod
+  fun isGooglePaySupported(merchantId: String, promise: Promise) {
+    Log.d("TEST", "isGooglePaySupported is called")
+    val currentActivity = reactApplicationContext.currentActivity
+    if (currentActivity == null) {
+      promise.reject("NO_ACTIVITY", "No activity found")
+      return
+    }
+
+    instance!!.createGooglePay(currentActivity, merchantId) {
+      if (it is PEGooglePayStatus.Eligible) {
+        googlePay = it.googlePayInstance
+        promise.resolve(true)
+      } else if (it is PEGooglePayStatus.NotEligible) {
+        googlePay = null
+        promise.reject("NOT_SUPPORTED", it.error.localizedMessage, it.error)
+      }
+    }
+  }
+
   companion object {
     var instance: PayEngine? = null
     var googlePay: PEGooglePayInterface? = null

package/android/src/main/java/com/reactnativepayengine/v2/features/googlepay/RNPEGooglePayButton.kt

@@ -11,13 +11,13 @@ import com.google.gson.Gson
 import com.payengine.paymentsdk.features.googlepay.PEGooglePayDelegate
 import com.payengine.paymentsdk.features.googlepay.PEGooglePayStatus
 import com.payengine.paymentsdk.features.googlepay.nmi.GooglePayPaymentRequest
+import com.payengine.paymentsdk.features.googlepay.payengine.PEAddress
 import com.reactnativepayengine.v2.RNPayEngineNative
 import com.reactnativepayengine.v2.securefields.RNPEEvents
 
 class RNPEGooglePayButton(private val context: ThemedReactContext, private val activity: Activity?): LinearLayout(context),
   PEGooglePayDelegate {
 
-  private var merchantId: String? = null
   private var paymentRequest: GooglePayPaymentRequest? = null
 
   init {
@@ -29,52 +29,29 @@ class RNPEGooglePayButton(private val context: ThemedReactContext, private val a
     this.layoutParams = layoutParams
   }
 
-//  fun setAmount(amount: Double) {
-//    this.amount = amount
-//    this.setupView()
-//  }
-//
-//  fun setMerchantId(merchantId: String) {
-//    this.merchantId = merchantId
-//    this.setupView()
-//  }
-
   fun setPaymentRequest(text: String) {
     Log.d("TEST", "Received pm request $text")
     val rnPaymentRequest = Gson().fromJson(text, RNPEPaymentRequest::class.java)
     val paymentRequest = rnPaymentRequest.toSDKRequest()
     Log.d("TEST", "Decoded ${Gson().toJson(paymentRequest)}")
     this.paymentRequest = paymentRequest
-    this.merchantId = rnPaymentRequest.merchantId
 
     this.setupView()
   }
 
-  internal fun setupView() {
-    Log.d("TEST", "setupView is called")
-//    if (amount == null || merchantId == null) return
-    if (paymentRequest == null) {
-      Log.d("TEST", "setupView is called but stopped here")
-      return
+  private fun setupView() {
+    if (RNPayEngineNative.googlePay == null) {
+      throw Exception("userCanPay must be called before rendering button")
     }
 
-    this.activity?.let {
-      RNPayEngineNative.instance?.createGooglePay(it, this.merchantId!!) {
-        if (it is PEGooglePayStatus.Eligible) {
-          val googlepay = it.googlePayInstance
-          RNPayEngineNative.googlePay = googlepay
+    val googlePay = RNPayEngineNative.googlePay!!
 
-          googlepay.delegate = this
-          googlepay.setupGooglePayButton(this.paymentRequest!!) {
-            if (it != null) {
-              this.addView(it)
-            } else {
-              this.paymentFailure(Error("Google pay is not available"))
-            }
-          }
-        } else if (it is PEGooglePayStatus.NotEligible) {
-          this.paymentFailure(Error("Google pay is not available: ${it.error}"))
-        }
+    googlePay.delegate = this
+    googlePay.setupGooglePayButton(this.paymentRequest!!) {
+      if (it != null) {
+        this.addView(it)
+      } else {
+        this.paymentFailure(Error("Google pay is not available"))
       }
     }
   }
@@ -97,10 +74,24 @@ class RNPEGooglePayButton(private val context: ThemedReactContext, private val a
       .emit(RNPEEvents.ON_GOOGLE_PAY_DISMISS, params)
   }
 
-  override fun paymentTokenDidReturn(token: String) {
+  override fun paymentTokenDidReturn(
+    token: String,
+    metadata: Map<String, Any>?,
+    billingAddress: PEAddress?,
+    shippingAddress: PEAddress?
+  ) {
     Log.d("PE", "paymentTokenDidReturn: $token")
     val params = Arguments.createMap().apply {
       putString("token", token)
+      if (metadata != null) {
+        putString("metadata", Gson().toJson(metadata))
+      }
+      if (billingAddress != null) {
+        putString("billingAddress", Gson().toJson(billingAddress))
+      }
+      if (shippingAddress != null) {
+        putString("shippingAddress", Gson().toJson(shippingAddress))
+      }
     }
     context
       .getJSModule(RCTDeviceEventEmitter::class.java)

package/ios/PayEngineSDK.xcframework/ios-arm64/PayEngineSDK.framework/Headers/PayEngineSDK-Swift.h

@@ -446,13 +446,14 @@ SWIFT_CLASS("_TtC12PayEngineSDK10PEApplePay")
 - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController * _Nonnull)controller didAuthorizePayment:(PKPayment * _Nonnull)payment completion:(void (^ _Nonnull)(PKPaymentAuthorizationStatus))completion;
 @end
 
+@class PKContact;
 enum PEApplePayResult : NSInteger;
 
 SWIFT_PROTOCOL("_TtP12PayEngineSDK18PEApplePayDelegate_")
 @protocol PEApplePayDelegate
 - (void)paymentErrorWithError:(NSError * _Nonnull)error;
 - (void)paymentSheetDidMDismiss;
-- (void)paymentTokenDidReturnWithToken:(NSString * _Nonnull)token completion:(void (^ _Nonnull)(enum PEApplePayResult))completion;
+- (void)paymentTokenDidReturnWithToken:(NSString * _Nonnull)token metadata:(NSDictionary<NSString *, id> * _Nullable)metadata billingContact:(PKContact * _Nullable)billingContact shippingContact:(PKContact * _Nullable)shippingContact completion:(void (^ _Nonnull)(enum PEApplePayResult))completion;
 - (void)paymentTokenNotAvailableWithError:(NSError * _Nullable)error;
 @end