@primer-io/react-native 0.13.0-beta.1 → 0.15.2

package/android/src/main/java/com/primerioreactnative/PrimerRNEventListener.kt

@@ -1,124 +1,169 @@
 package com.primerioreactnative
 
 import android.util.Log
-import com.facebook.react.bridge.Callback
-import com.primerioreactnative.datamodels.ErrorTypeRN
-import com.primerioreactnative.datamodels.PrimerErrorRN
-import com.primerioreactnative.datamodels.PrimerOnClientSessionActionsRequestRN
-import com.primerioreactnative.datamodels.PrimerPaymentInstrumentTokenRN
-import com.primerioreactnative.utils.PrimerEventQueueRN
+import com.primerioreactnative.datamodels.*
+import com.primerioreactnative.utils.PrimerImplementedRNCallbacks
+import com.primerioreactnative.utils.asError
+import com.primerioreactnative.utils.errorTo
 import io.primer.android.CheckoutEventListener
-import io.primer.android.completion.ActionResumeHandler
 import io.primer.android.completion.ResumeHandler
 import io.primer.android.events.CheckoutEvent
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import org.json.JSONObject
 
 class PrimerRNEventListener : CheckoutEventListener {
 
-  private var onTokenizeSuccessQueue: PrimerEventQueueRN? = null
-  private var onClientSessionActionsQueue: PrimerEventQueueRN? = null
-  private var onResumeSuccessQueue: PrimerEventQueueRN? = null
-  private var onVaultSuccessQueue: PrimerEventQueueRN? = null
-  private var onDismissQueue: PrimerEventQueueRN? = null
-  var onPrimerErrorQueue: PrimerEventQueueRN? = null
-  var onSavedPaymentInstrumentsFetchedQueue: PrimerEventQueueRN? = null
+  private var clientTokenCallback: ((String?, PrimerErrorRN?) -> Unit)? = null
+  private var onClientSessionActions: ((String?, PrimerErrorRN?) -> Unit)? = null
+  private var onTokenizeSuccess: ((String?, PrimerErrorRN?) -> Unit)? = null
+  private var onResumeSuccess: ((String?, PrimerErrorRN?) -> Unit)? = null
+  private var implementedRNCallbacks: PrimerImplementedRNCallbacks? = null
 
-  var completion: ((error: String?, token: String?) -> Unit)? = null
-  var actionCompletion: ((error: String?, token: String?) -> Unit)? = null
+  private var resumeHandler: ResumeHandler? = null
 
-  var resumeHandler: ResumeHandler? = null
-  var actionResumeHandler: ActionResumeHandler? = null
-
-  fun configureOnTokenizeSuccess(callback: Callback) {
-    onTokenizeSuccessQueue = PrimerEventQueueRN()
-    onTokenizeSuccessQueue?.poll(callback)
-  }
-
-  fun configureOnClientSessionActions(callback: Callback) {
-    onClientSessionActionsQueue = PrimerEventQueueRN()
-    onClientSessionActionsQueue?.poll(callback)
-  }
-
-  fun configureOnResumeSuccess(callback: Callback) {
-    onResumeSuccessQueue = PrimerEventQueueRN()
-    onResumeSuccessQueue?.poll(callback)
-  }
-
-  fun configureOnVaultSuccess(callback: Callback) {
-    onVaultSuccessQueue = PrimerEventQueueRN()
-    onVaultSuccessQueue?.poll(callback)
-  }
-
-  fun configureOnDismiss(callback: Callback) {
-    onDismissQueue = PrimerEventQueueRN()
-    onDismissQueue?.poll(callback)
-  }
-
-  fun configureOnPrimerError(callback: Callback) {
-    onPrimerErrorQueue = PrimerEventQueueRN()
-    onPrimerErrorQueue?.poll(callback)
-  }
-
-  fun configureOnSavedPaymentInstrumentsFetched(callback: Callback) {
-    onSavedPaymentInstrumentsFetchedQueue = PrimerEventQueueRN()
-    onSavedPaymentInstrumentsFetchedQueue?.poll(callback)
-  }
+  var sendEvent: ((eventName: String, paramsJson: JSONObject?) -> Unit)? = null
+  var sendError: ((error: PrimerErrorRN) -> Unit)? = null
 
   override fun onClientSessionActions(event: CheckoutEvent.OnClientSessionActions) {
     val token = PrimerOnClientSessionActionsRequestRN.build(event.data)
-    val request = Json.encodeToString(token)
+    val request = JSONObject(Json.encodeToString(token))
 
-    onClientSessionActionsQueue?.addRequestAndPoll(request)
-    actionResumeHandler = event.resumeHandler
+    onClientSessionActions = { newClientToken, err ->
+      when {
+          err != null -> resumeHandler?.handleError(err.asError())
+          newClientToken != null -> resumeHandler?.handleNewClientToken(newClientToken)
+          else -> resumeHandler?.handleSuccess()
+      }
+    }
+
+    event.resumeHandler.handleClientToken(null)
+    sendEvent?.invoke(PrimerEventsRN.OnClientSessionActions.string, request)
   }
 
   override fun onCheckoutEvent(e: CheckoutEvent) {
     when (e) {
-      is CheckoutEvent.TokenAddedToVault -> {
-        val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(e.data)
-        val request = Json.encodeToString(token)
-        onVaultSuccessQueue?.addRequestAndPoll(request)
-      }
       is CheckoutEvent.TokenizationSuccess -> {
         val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(e.data)
-        val request = Json.encodeToString(token)
-        onTokenizeSuccessQueue?.addRequestAndPoll(request)
+        val request = JSONObject(Json.encodeToString(token))
+        onTokenizeSuccess = { newClientToken, err ->
+          when {
+            err != null -> resumeHandler?.handleError(err.asError())
+            newClientToken != null -> resumeHandler?.handleNewClientToken(newClientToken)
+            else -> resumeHandler?.handleSuccess()
+          }
+        }
+
         resumeHandler = e.resumeHandler
-      }
-      is CheckoutEvent.TokenSelected -> {
-        val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(e.data)
-        val request = Json.encodeToString(token)
-        onTokenizeSuccessQueue?.addRequestAndPoll(request)
+        sendEvent?.invoke(PrimerEventsRN.OnTokenizeSuccessCallback.string, request)
       }
       is CheckoutEvent.ResumeSuccess -> {
         val token = e.resumeToken
-        onResumeSuccessQueue?.addRequestAndPoll(token)
-        resumeHandler = e.resumeHandler
-      }
-      is CheckoutEvent.Exit -> {
-        onDismissQueue?.addRequestAndPoll("dismiss")
-        onDismissQueue = null
+        if (implementedRNCallbacks?.isOnResumeSuccessImplemented == true) {
+          onResumeSuccess = { newClientToken, err ->
+            when {
+              err != null -> resumeHandler?.handleError(err.asError())
+              newClientToken != null -> resumeHandler?.handleNewClientToken(newClientToken)
+              else -> resumeHandler?.handleSuccess()
+            }
+          }
+
+          resumeHandler = e.resumeHandler
+          val resumeToken = mapOf(Keys.RESUME_TOKEN to token)
+          sendEvent?.invoke(
+            PrimerEventsRN.OnResumeSuccess.string,
+            JSONObject(Json.encodeToString(resumeToken))
+          )
+        } else {
+          sendError?.invoke(ErrorTypeRN.InitFailed
+            errorTo "Callback [onResumeSuccess] should had been implemented.")
+        }
       }
       is CheckoutEvent.ApiError -> {
         Log.e("PrimerRN", "ApiError: ${e.data}")
-        val exception = PrimerErrorRN(
-          ErrorTypeRN.CheckoutFlowFailed,
-          e.data.description,
+        val exception = ErrorTypeRN.CheckoutFlowFailed errorTo e.data.description
+        sendError?.invoke(exception)
+      }
+      is CheckoutEvent.TokenAddedToVault -> {
+        val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(e.data)
+        val request = JSONObject(Json.encodeToString(token))
+        sendEvent?.invoke(
+          PrimerEventsRN.OnVaultSuccess.string,
+          request
         )
-        val data = Json.encodeToString(exception)
-        onPrimerErrorQueue?.addRequestAndPoll(data)
+      }
+      is CheckoutEvent.TokenSelected -> {
+        val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(e.data)
+        val request = JSONObject(Json.encodeToString(token))
+        onTokenizeSuccess = { newClientToken, err ->
+          when {
+            err != null -> resumeHandler?.handleError(err.asError())
+            newClientToken != null -> resumeHandler?.handleNewClientToken(newClientToken)
+            else -> resumeHandler?.handleSuccess()
+          }
+        }
+
+        resumeHandler = e.resumeHandler
+        sendEvent?.invoke(PrimerEventsRN.OnTokenizeSuccessCallback.string, request)
+      }
+      is CheckoutEvent.Exit -> {
+        removeCallbacksAndHandlers()
+        if (implementedRNCallbacks?.isOnCheckoutDismissedImplemented == true) {
+          sendEvent?.invoke(
+            PrimerEventsRN.OnCheckoutDismissed.string,
+            null
+          )
+        } else {
+          sendError?.invoke(ErrorTypeRN.InitFailed
+            errorTo "Callback [onCheckoutDismissed] should had been implemented.")
+        }
       }
       is CheckoutEvent.TokenizationError -> {
-        Log.e("PrimerRN", "TokenizationError: ${e.data}")
-        val exception = PrimerErrorRN(
-          ErrorTypeRN.TokenizationFailed,
-          e.data.description,
-        )
-        val data = Json.encodeToString(exception)
-        onPrimerErrorQueue?.addRequestAndPoll(data)
+        if (implementedRNCallbacks?.isCheckoutFailedImplemented == true) {
+          Log.e("PrimerRN", "TokenizationError: ${e.data}")
+          val exception = ErrorTypeRN.TokenizationFailed errorTo e.data.description
+          sendError?.invoke(exception)
+        } else {
+          sendError?.invoke(ErrorTypeRN.InitFailed
+            errorTo "Callback [onResumeError] should had been implemented.")
+        }
       }
       else -> Unit
     }
   }
+
+  fun onClientTokenCallback(clientToken: String?, error: PrimerErrorRN?) {
+    this.clientTokenCallback?.invoke(clientToken, error)
+    sendEvent?.invoke(PrimerEventsRN.OnClientTokenCallback.string, null)
+  }
+
+  fun onClientSessionActions(clientToken: String?, error: PrimerErrorRN?) {
+    if (implementedRNCallbacks?.isClientSessionActionsImplemented == true) {
+      this.onClientSessionActions?.invoke(clientToken, error)
+    }
+  }
+
+  fun onTokenizeSuccess(clientToken: String?, error: PrimerErrorRN?) {
+    this.onTokenizeSuccess?.invoke(clientToken, error)
+  }
+
+  fun onResumeSuccess(clientToken: String?, error: PrimerErrorRN?) {
+    if (implementedRNCallbacks?.isOnResumeSuccessImplemented == true) {
+      this.onResumeSuccess?.invoke(clientToken, error)
+    } else {
+      sendError?.invoke(ErrorTypeRN.CheckoutFlowFailed
+        errorTo "Callback [onResumeSuccess] should had been implemented.")
+    }
+  }
+
+  fun removeCallbacksAndHandlers() {
+    clientTokenCallback = null
+    onClientSessionActions = null
+    onTokenizeSuccess = null
+    onResumeSuccess = null
+  }
+
+  fun setImplementedCallbacks(implementedRNCallbacks: PrimerImplementedRNCallbacks) {
+    this.implementedRNCallbacks = implementedRNCallbacks
+  }
 }

package/android/src/main/java/com/primerioreactnative/ReactNativePackage.kt

@@ -4,26 +4,15 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import kotlinx.serialization.json.Json
 
-class ReactNativePackage : ReactPackage {
-
-  private val json = Json { ignoreUnknownKeys = true }
 
+class ReactNativePackage : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(
-      PrimerRN(reactContext),
-      PrimerHeadlessUniversalCheckout(reactContext, json)
-    )
+    return listOf(PrimerRN(reactContext))
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return mutableListOf(
-      PrimerCardNumberEditTextManager(),
-      PrimerCardholderNameEditTextManager(),
-      PrimerExpiryEditTextManager(),
-      PrimerCvvEditTextManager(),
-    )
+    return emptyList()
   }
 }
 

package/android/src/main/java/com/primerioreactnative/datamodels/PrimerErrorRN.kt

@@ -5,8 +5,9 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PrimerErrorRN(
-  val errorType: ErrorTypeRN,
-  val description: String? = null,
+  val errorId: String? = null,
+  val errorDescription: String? = null,
+  val recoverySuggestion: String? = null
 )
 
 @Serializable
@@ -15,6 +16,4 @@ enum class ErrorTypeRN {
   InitFailed,
   CheckoutFlowFailed,
   TokenizationFailed,
-  AssetMissing,
-  AssetMismatch
 }

package/android/src/main/java/com/primerioreactnative/datamodels/PrimerEventsRN.kt

@@ -0,0 +1,11 @@
+package com.primerioreactnative.datamodels
+
+sealed class PrimerEventsRN(val string: String) {
+  object OnClientTokenCallback: PrimerEventsRN("onClientTokenCallback")
+  object OnClientSessionActions: PrimerEventsRN("onClientSessionActions")
+  object OnTokenizeSuccessCallback: PrimerEventsRN("onTokenizeSuccessCallback")
+  object OnResumeSuccess: PrimerEventsRN("onResumeSuccess")
+  object OnCheckoutDismissed: PrimerEventsRN("onCheckoutDismissed")
+  object OnError: PrimerEventsRN("onError")
+  object OnVaultSuccess: PrimerEventsRN("onVaultSuccess")
+}

package/android/src/main/java/com/primerioreactnative/datamodels/PrimerSettingsRN.kt

@@ -92,17 +92,18 @@ data class OptionsRN(
   val isResultScreenEnabled: Boolean? = null,
   val isLoadingScreenEnabled: Boolean? = null,
   val isFullScreenEnabled: Boolean? = null,
-  val isThreeDsEnabled: Boolean? = null,
+  val is3DSOnVaultingEnabled: Boolean? = null,
   val locale: String? = null,
   val android: AndroidOptionsRN? = null,
+  val is3DSDevelopmentModeEnabled: Boolean = true
 ) {
   fun format(): Options {
     return Options(
       showUI = isLoadingScreenEnabled ?: true,
       redirectScheme = android?.redirectScheme,
-      is3DSOnVaultingEnabled = isThreeDsEnabled ?: false,
+      is3DSOnVaultingEnabled = is3DSOnVaultingEnabled ?: false,
       debugOptions = PrimerDebugOptions(
-        is3DSSanityCheckEnabled = true, // false on emulator
+        is3DSSanityCheckEnabled = !is3DSDevelopmentModeEnabled, // false on emulator
       ),
     )
   }

package/android/src/main/java/com/primerioreactnative/utils/ErrorHelper.kt

@@ -0,0 +1,11 @@
+package com.primerioreactnative.utils
+
+import com.primerioreactnative.datamodels.ErrorTypeRN
+import com.primerioreactnative.datamodels.PrimerErrorRN
+
+infix fun ErrorTypeRN.errorTo(message: String) = PrimerErrorRN(
+  ErrorTypeRN.CheckoutFlowFailed.name,
+  message
+)
+
+fun PrimerErrorRN.asError() = Error("${this.errorId}: ${this.errorDescription}")

package/android/src/main/java/com/primerioreactnative/utils/PrimerImplementedRNCallbacks.kt

@@ -0,0 +1,14 @@
+package com.primerioreactnative.utils
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PrimerImplementedRNCallbacks(
+  val isClientTokenCallbackImplemented: Boolean? = null,
+  val isTokenAddedToVaultImplemented: Boolean? = null,
+  val isOnResumeSuccessImplemented: Boolean? = null,
+  val isOnResumeErrorImplemented: Boolean? = null,
+  val isOnCheckoutDismissedImplemented: Boolean? = null,
+  val isCheckoutFailedImplemented: Boolean? = null,
+  val isClientSessionActionsImplemented: Boolean? = null
+)

package/ios/DataModels/PrimerErrorRN.swift

@@ -15,7 +15,7 @@ enum ErrorTypeRN: String, Error, Encodable {
     case generic
 }
 
-struct NativeError: CustomNSError, LocalizedError {
+struct NativeError: CustomNSError, LocalizedError, Codable {
     let errorId: String
     let errorDescription: String?
     let recoverySuggestion: String?

package/ios/DataModels/PrimerSettingsRN.swift

@@ -20,6 +20,8 @@ extension PrimerSettingsRN {
                 postalCode: billingAddress.postalCode
             )
         }
+        
+        let debugOptions = PrimerDebugOptions(is3DSSanityCheckEnabled: !(options?.is3DSDevelopmentModeEnabled ?? false))
     
         return PrimerSettings(
             merchantIdentifier: options?.ios?.merchantIdentifier,
@@ -35,7 +37,9 @@ extension PrimerSettingsRN {
             businessDetails: business?.primerFormat,
             orderItems: order?.itemsFormatted ?? [],
             isInitialLoadingHidden: !(options?.isLoadingScreenEnabled ?? true),
+            is3DSOnVaultingEnabled: options?.is3DSOnVaultingEnabled ?? false,
             orderId: order?.id,
+            debugOptions: debugOptions,
             customer: Customer(
                 firstName: customer?.firstName,
                 lastName: customer?.lastName,
@@ -145,6 +149,8 @@ fileprivate struct OptionsRN: Decodable {
     let isResultScreenEnabled: Bool?
     let isLoadingScreenEnabled: Bool?
     let isFullScreenEnabled: Bool?
+    let is3DSOnVaultingEnabled: Bool?
+    let is3DSDevelopmentModeEnabled: Bool?
     let locale: String?
     let ios: IosOptionsRN?
 }

package/ios/RNTPrimer.m

@@ -0,0 +1,43 @@
+//
+//  RNTPrimer.m
+//  primer-io-react-native
+//
+//  Created by Evangelos on 15/3/22.
+//
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_MODULE(NativePrimer, RCTEventEmitter)
+
+RCT_EXTERN_METHOD(configureWithSettings:(NSString *)settingsStr resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(configureWithTheme:(NSString *)themeStr resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(showUniversalCheckout:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(showUniversalCheckoutWithClientToken:(NSString *)clientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(showVaultManager:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(showVaultManager:(NSString *)clientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+
+
+RCT_EXTERN_METHOD(handleNewClientToken:(NSString *)clientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(handleError:(NSString *)errorStr resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(handleSuccess:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+RCT_EXTERN_METHOD(setImplementedRNCallbacks:(NSString *)implementedRNCallbacksStr resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+
+
+
+
+
+RCT_EXTERN_METHOD(showPaymentMethod:(NSString *)clientToken paymentMethodStr:(NSString *)paymentMethodStr intentStr:(NSString *)intentStr resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+
+@end
+