@primer-io/react-native 0.6.4 → 0.6.8

package/README.md

@@ -43,15 +43,13 @@ import { Primer } from '@primer-io/react-native';
 const token: string = await fetchClientToken();
 
 // configure listeners and settings.
-const onTokenizeSuccess = (t, handler) => {
-  setPaymentInstrument(t);
-  handler.resumeWithSuccess(); // call this to resume the checkout flow.
+const onTokenizeSuccess = async (t, handler) => {
+  const payment = await createPayment(t);
+  handler.handleSuccess(); // resume the checkout flow with success message.
 };
 
-const settings = { order: { amount: 50, currency: 'GBP' } };
-
 // show Universal Checkout with client token and config.
-Primer.showUniversalCheckout(token, { onTokenizeSuccess, settings });
+Primer.showUniversalCheckout(token, { onTokenizeSuccess });
 ```
 
 For more info & help troubleshooting, check out our 🔥 [docs](https://www.notion.so/primerio/Quick-Start-6c5eb61e5bbe426ca66244259e06048e)

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Dec 02 15:56:45 GMT 2021
+gradle.version=7.0.2

package/android/build.gradle

@@ -128,5 +128,5 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2"
-  implementation 'io.primer:android:1.0.0-beta.30'
+  implementation 'io.primer:android:1.4.0'
 }

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

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.primerioreactnative.datamodels.*
 import io.primer.android.Primer
+import io.primer.android.model.dto.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -87,6 +88,11 @@ class PrimerRN(reactContext: ReactApplicationContext) : ReactContextBaseJavaModu
     mListener.configureOnTokenizeSuccess(callback)
   }
 
+  @ReactMethod
+  fun configureOnResumeSuccess(callback: Callback) {
+    mListener.configureOnResumeSuccess(callback)
+  }
+
   @ReactMethod
   fun configureOnVaultSuccess(callback: Callback) {
     mListener.configureOnVaultSuccess(callback)
@@ -113,9 +119,28 @@ class PrimerRN(reactContext: ReactApplicationContext) : ReactContextBaseJavaModu
   }
 
   private fun startSdk(token: String) {
-    val context = currentActivity as Context
-    val theme = this.theme.primerTheme
-    Primer.initialize(context, token, theme = theme)
+    val theme = theme.format()
+    val settings = settings.format()
+    val config = PrimerConfig(theme, settings)
+
+    // todo: refactor with next version
+    mListener.completion = { error, clientToken ->
+      currentActivity?.let {
+        it.runOnUiThread {
+          if (error != null) {
+            mListener.resumeHandler?.handleError(Error(error))
+          } else {
+            if (clientToken == null) {
+              mListener.resumeHandler?.handleSuccess()
+            } else {
+              mListener.resumeHandler?.handleNewClientToken(clientToken)
+            }
+          }
+        }
+      }
+    }
+
+    Primer.instance.configure(config, mListener)
     sdkWasInitialised = true
   }
 
@@ -125,28 +150,12 @@ class PrimerRN(reactContext: ReactApplicationContext) : ReactContextBaseJavaModu
 
     if (!sdkWasInitialised) startSdk(token)
 
-    Primer.getSavedPaymentMethods { data ->
-      try {
-        val paymentMethods = data.map { PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(it) }
-        val request = json.encodeToString(paymentMethods)
-        mListener.onSavedPaymentInstrumentsFetchedQueue?.addRequestAndPoll(request)
-      } catch (e: Exception) {
-        Log.e("PrimerRN", "fetch saved payment methods error: $e")
-        val exception = PrimerErrorRN(
-          ErrorTypeRN.ParseJsonFailed,
-          "failed to parse fetched payment methods.",
-        )
-        val encoded = json.encodeToString(exception)
-        mListener.onPrimerErrorQueue?.addRequestAndPoll(encoded)
-        haltExecution = true
-      }
-    }
+    Primer.instance.fetchSavedPaymentInstruments(token)
   }
 
   @ReactMethod
   fun initialize(token: String) {
     try {
-
       if (haltExecution) {
         haltExecution = false
         return
@@ -154,50 +163,13 @@ class PrimerRN(reactContext: ReactApplicationContext) : ReactContextBaseJavaModu
 
       Log.d("PrimerRN", "init with client token: $token")
 
-      val theme = this.theme.primerTheme
-
-      val context = currentActivity as Context
-
       startSdk(token)
 
-      val paymentMethods = intent.toPaymentMethods(settings)
-      Primer.loadPaymentMethods(paymentMethods)
-
-      mListener.completion = { error ->
-        currentActivity?.let {
-          it.runOnUiThread {
-            if (error) {
-              Primer.showError()
-            } else {
-              Primer.showSuccess()
-            }
-          }
-        }
-      }
+      val context = currentActivity as Context
 
       when (intent.vault) {
-        false -> Primer.showCheckout(
-          context,
-          mListener,
-          isStandalonePaymentMethod = paymentMethods.size < 2,
-          doNotShowUi = !(settings.options?.isLoadingScreenEnabled ?: true),
-          preferWebView = true,
-          currency = settings.order?.currency,
-          amount = settings.order?.amount,
-          clearAllListeners = true,
-          webBrowserRedirectScheme = settings.options?.android?.redirectScheme,
-        )
-        true -> Primer.showVault(
-          context,
-          mListener,
-          isStandalonePaymentMethod = paymentMethods.size < 2,
-          doNotShowUi = !(settings.options?.isLoadingScreenEnabled ?: true),
-          preferWebView = true,
-          currency = settings.order?.currency,
-          amount = settings.order?.amount,
-          clearAllListeners = true,
-          webBrowserRedirectScheme = settings.options?.android?.redirectScheme,
-        )
+        false -> Primer.instance.showUniversalCheckout(context, token)
+        true -> Primer.instance.showVaultManager(context, token)
       }
     } catch (e: Exception) {
       Log.e("PrimerRN", "init error: $e")
@@ -213,8 +185,9 @@ class PrimerRN(reactContext: ReactApplicationContext) : ReactContextBaseJavaModu
   @ReactMethod
   fun resume(request: String) {
     try {
+      Log.d("PrimerRN", "resume: $request")
       val data = json.decodeFromString<PrimerResumeRequest>(request)
-      mListener.completion?.invoke(data.error)
+      mListener.completion?.invoke(data.error, data.token)
     } catch (e: Exception) {
       Log.e("PrimerRN", "configure settings error: $e")
       val exception = PrimerErrorRN(

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

@@ -7,7 +7,7 @@ import com.primerioreactnative.datamodels.PrimerErrorRN
 import com.primerioreactnative.datamodels.PrimerPaymentInstrumentTokenRN
 import com.primerioreactnative.utils.PrimerEventQueueRN
 import io.primer.android.CheckoutEventListener
-import io.primer.android.Primer
+import io.primer.android.completion.ResumeHandler
 import io.primer.android.events.CheckoutEvent
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -15,18 +15,26 @@ import kotlinx.serialization.json.Json
 class PrimerRNEventListener : CheckoutEventListener {
 
   private var onTokenizeSuccessQueue: 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
 
-  var completion: ((error: Boolean) -> Unit)? = null
+  var completion: ((error: String?, token: String?) -> Unit)? = null
+
+  var resumeHandler: ResumeHandler? = null
 
   fun configureOnTokenizeSuccess(callback: Callback) {
     onTokenizeSuccessQueue = PrimerEventQueueRN()
     onTokenizeSuccessQueue?.poll(callback)
   }
 
+  fun configureOnResumeSuccess(callback: Callback) {
+    onResumeSuccessQueue = PrimerEventQueueRN()
+    onResumeSuccessQueue?.poll(callback)
+  }
+
   fun configureOnVaultSuccess(callback: Callback) {
     onVaultSuccessQueue = PrimerEventQueueRN()
     onVaultSuccessQueue?.poll(callback)
@@ -58,14 +66,24 @@ class PrimerRNEventListener : CheckoutEventListener {
         val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(e.data)
         val request = Json.encodeToString(token)
         onTokenizeSuccessQueue?.addRequestAndPoll(request)
+        resumeHandler = e.resumeHandler
       }
       is CheckoutEvent.TokenSelected -> {
         val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(e.data)
         val request = Json.encodeToString(token)
         onTokenizeSuccessQueue?.addRequestAndPoll(request)
       }
+      is CheckoutEvent.ResumeSuccess -> {
+        val token = e.resumeToken
+        onResumeSuccessQueue?.addRequestAndPoll(token)
+        resumeHandler = e.resumeHandler
+      }
+      is CheckoutEvent.SavedPaymentInstrumentsFetched -> {
+        val list = e.data.map { PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(it) }
+        val request = Json.encodeToString(list)
+        onSavedPaymentInstrumentsFetchedQueue?.addRequestAndPoll(request)
+      }
       is CheckoutEvent.Exit -> {
-        println("🔥 exit event ${e.data}")
         onDismissQueue?.addRequestAndPoll("dismiss")
         onDismissQueue = null
       }

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

@@ -4,5 +4,6 @@ import kotlinx.serialization.*
 
 @Serializable
 data class PrimerResumeRequest(
-  val error: Boolean,
+  val error: String? = null,
+  val token: String? = null,
 )

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

@@ -1,14 +1,24 @@
 package com.primerioreactnative.datamodels
 
+import io.primer.android.model.PrimerDebugOptions
+import io.primer.android.model.dto.*
 import kotlinx.serialization.Serializable
 
 @Serializable
 class PrimerSettingsRN(
   val order: OrderRN? = null,
   val business: BusinessRN? = null,
-  val customer: CustomerRN? = null,
-  val options: OptionsRN? = null,
-)
+  private val customer: CustomerRN? = null,
+  private val options: OptionsRN? = null,
+) {
+  fun format(): PrimerSettings {
+    val order = order?.format() ?: Order()
+    val customer = customer?.format() ?: Customer()
+    val business = business?.format() ?: Business()
+    val options = options?.format() ?: Options()
+    return PrimerSettings(order, customer, business, options)
+  }
+}
 
 @Serializable
 data class OrderRN(
@@ -17,7 +27,16 @@ data class OrderRN(
   val countryCode: String? = null,
   val items: List<OrderItemRN>? = null,
   val shipping: PrimerAddressRN? = null,
-)
+) {
+  fun format(): Order {
+    return Order(
+      amount = amount,
+      currency = currency,
+      countryCode = countryCode?.let { CountryCode.valueOf(it) },
+
+    )
+  }
+}
 
 @Serializable
 data class OrderItemRN(
@@ -34,7 +53,18 @@ data class BusinessRN(
   val email: String? = null,
   val phone: String? = null,
   val address: PrimerAddressRN? = null,
-)
+) {
+
+  fun format(): Business {
+    return Business(
+      name = name,
+      registrationNumber = registrationNumber,
+      email = email,
+      phone = phone,
+      address = address?.format(),
+    )
+  }
+}
 
 @Serializable
 data class CustomerRN(
@@ -44,16 +74,39 @@ data class CustomerRN(
   val email: String? = null,
   val phone: String? = null,
   val billing: PrimerAddressRN? = null,
-)
+) {
+  fun format(): Customer {
+    return Customer(
+      id = id,
+      firstName = firstName,
+      lastName = lastName,
+      email = email,
+      homePhone = phone,
+      billingAddress = billing?.format(),
+    )
+  }
+}
 
 @Serializable
 data class OptionsRN(
   val isResultScreenEnabled: Boolean? = null,
   val isLoadingScreenEnabled: Boolean? = null,
   val isFullScreenEnabled: Boolean? = null,
+  val isThreeDsEnabled: Boolean? = null,
   val locale: String? = null,
   val android: AndroidOptionsRN? = null,
-)
+) {
+  fun format(): Options {
+    return Options(
+      showUI = isLoadingScreenEnabled ?: true,
+      redirectScheme = android?.redirectScheme,
+      is3DSOnVaultingEnabled = isThreeDsEnabled ?: false,
+      debugOptions = PrimerDebugOptions(
+        is3DSSanityCheckEnabled = true, // false on emulator
+      ),
+    )
+  }
+}
 
 @Serializable
 data class AndroidOptionsRN(
@@ -62,10 +115,30 @@ data class AndroidOptionsRN(
 
 @Serializable
 data class PrimerAddressRN(
-  val line1: String,
+  val line1: String?,
   val line2: String? = null,
-  val postalCode: String,
+  val postalCode: String?,
   val state: String? = null,
-  val city: String,
-  val country: String,
-)
+  val city: String?,
+  val country: String?,
+) {
+
+  fun format(): Address? {
+      if (
+        line1 == null ||
+        postalCode == null ||
+        city == null ||
+        country == null
+      ) {
+        return null
+      }
+
+      return Address(
+        line1 = line1,
+        line2 = line2,
+        city = city,
+        countryCode = CountryCode.valueOf(country),
+        postalCode = postalCode,
+      )
+  }
+}

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

@@ -1,6 +1,7 @@
 package com.primerioreactnative.datamodels
 
-import io.primer.android.UniversalCheckoutTheme
+import io.primer.android.InputThemeData
+import io.primer.android.PrimerTheme
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -8,20 +9,11 @@ class PrimerThemeRN(
   private val colors: ColorThemeRN? = null,
   val darkModeColors: ColorThemeRN? = null,
 ) {
-  val primerTheme: UniversalCheckoutTheme
-    get() {
-      return UniversalCheckoutTheme.create(
-        textDefaultColor = colors?.text?.hex,
-        textDangerColor = colors?.error?.hex,
-        textMutedColor = colors?.disabled?.hex,
-        backgroundColor = colors?.background?.hex,
-        buttonPrimaryColor = colors?.mainColor?.hex,
-        buttonPrimaryColorDisabled = colors?.disabled?.hex,
-        primaryColor = colors?.mainColor?.hex,
-        inputBackgroundColor = colors?.background?.hex,
-        buttonDefaultBorderColor = colors?.borders?.hex,
+  fun format(): PrimerTheme {
+      return PrimerTheme.build(
+        input = InputThemeData()
       )
-    }
+  }
 }
 
 @Serializable

package/ios/DataModels/PrimerErrorRN.swift

@@ -13,3 +13,7 @@ enum ErrorTypeRN: String, Error, Encodable {
     case clientTokenNotConfigured
     case flowParsingFailed
 }
+
+struct ErrorRN: Error {
+    let message: String
+}

package/ios/DataModels/PrimerRequestRN.swift

@@ -5,7 +5,8 @@ struct PrimerInitRequest: Decodable {
 }
 
 struct PrimerResumeRequest: Decodable {
-    let error: Bool;
+    let error: String?
+    let token: String?
 }
 
 struct PrimerRequestMetadata: Decodable {

package/ios/DataModels/PrimerSettingsRN.swift

@@ -9,6 +9,18 @@ struct PrimerSettingsRN: Decodable {
 
 extension PrimerSettingsRN {
     func asPrimerSettings() -> PrimerSettings {
+        var address: Address?
+        if let billingAddress = customer?.billing {
+            address = Address(
+                addressLine1: billingAddress.line1,
+                addressLine2: billingAddress.line2,
+                city: billingAddress.city,
+                state: billingAddress.state,
+                countryCode: billingAddress.country?.rawValue,
+                postalCode: billingAddress.postalCode
+            )
+        }
+    
         return PrimerSettings(
             merchantIdentifier: options?.ios?.merchantIdentifier,
             customerId: customer?.id,
@@ -22,14 +34,26 @@ extension PrimerSettingsRN {
             hasDisabledSuccessScreen: !(options?.isResultScreenEnabled ?? true),
             businessDetails: business?.primerFormat,
             orderItems: order?.itemsFormatted ?? [],
-            isInitialLoadingHidden: !(options?.isLoadingScreenEnabled ?? true)
+            isInitialLoadingHidden: !(options?.isLoadingScreenEnabled ?? true),
+            orderId: order?.id,
+            customer: Customer(
+                firstName: customer?.firstName,
+                lastName: customer?.lastName,
+                email: customer?.email,
+                homePhoneNumber: nil,
+                mobilePhoneNumber: customer?.phone,
+                workPhoneNumber: nil,
+                billingAddress: address
+            )
         )
     }
 }
 
 fileprivate struct OrderRN: Decodable {
+    let id: String?
     let amount: Int?
     let currency: Currency?
+    // FIXME: Move countryCode only within Address (RN & Android)
     let countryCode: CountryCode?
     let items: [OrderItemRN]?
     let shipping: AddressRN?
@@ -70,11 +94,15 @@ fileprivate struct BusinessRN: Decodable {
     let registrationNumber: String?
     let email: String?
     let phone: String?
-    let address: AddressRN
+    let address: AddressRN?
 }
 
 fileprivate extension BusinessRN {
-    var primerFormat: BusinessDetails {
+    var primerFormat: BusinessDetails? {
+        guard let address = address else {
+            return nil
+        }
+        
         return BusinessDetails(
             name: name,
             address: address.primerFormat
@@ -97,7 +125,7 @@ fileprivate struct AddressRN: Decodable {
     let postalCode: String?
     let city: String?
     let state: String?
-    let country: String?
+    let country: CountryCode?
 }
 
 fileprivate extension AddressRN {
@@ -107,7 +135,7 @@ fileprivate extension AddressRN {
             addressLine2: line2,
             city: city,
             state: state,
-            countryCode: country,
+            countryCode: country?.rawValue,
             postalCode: postalCode
         )
     }

package/ios/PrimerRN+PrimerDelegate.swift

@@ -17,7 +17,10 @@ extension PrimerRN: PrimerDelegate {
         completion(clientToken, nil)
     }
     
-    func onTokenizeSuccess(_ paymentMethodToken: PaymentMethodToken, _ completion: @escaping (Error?) -> Void) {
+    func onTokenizeSuccess(
+        _ paymentMethodToken: PaymentMethodToken,
+        resumeHandler: ResumeHandlerProtocol
+    ) {
         do {
             let json = try encoder.encode(paymentMethodToken)
             let data = String(data: json, encoding: .utf8)!
@@ -25,7 +28,29 @@ extension PrimerRN: PrimerDelegate {
         } catch {
             checkoutFailed(with: ErrorTypeRN.ParseJsonFailed)
         }
-        onResumeFlowCallback = completion
+        onResumeFlowCallback = { error, clientToken in
+            if let error = error {
+                resumeHandler.handle(error: error)
+            } else if let clientToken = clientToken {
+                resumeHandler.handle(newClientToken: clientToken)
+            } else {
+                resumeHandler.handleSuccess()
+            }
+        }
+    }
+    
+    func onResumeSuccess(_ clientToken: String, resumeHandler: ResumeHandlerProtocol) {
+        self.onResumeSuccessCallback?([clientToken])
+        
+        onResumeFlowCallback = { error, clientToken in
+            if let error = error {
+                resumeHandler.handle(error: error)
+            } else if let clientToken = clientToken {
+                resumeHandler.handle(newClientToken: clientToken)
+            } else {
+                resumeHandler.handleSuccess()
+            }
+        }
     }
     
     func tokenAddedToVault(_ token: PaymentMethodToken) {

package/ios/PrimerRN.swift

@@ -1,7 +1,7 @@
 import UIKit
 import PrimerSDK
 
-typealias BasicCompletionBlock = ((Error?) -> Void)
+typealias BasicCompletionBlock = ((Error?, String?) -> Void)
 
 @objc(PrimerRN)
 class PrimerRN: NSObject {
@@ -17,6 +17,7 @@ class PrimerRN: NSObject {
     var theme: PrimerThemeRN?
     var flow: PrimerSessionFlow?
     var onTokenizeSuccessCallback: RCTResponseSenderBlock?
+    var onResumeSuccessCallback: RCTResponseSenderBlock?
     var onVaultSuccessCallback: RCTResponseSenderBlock?
     var onDismissCallback: RCTResponseSenderBlock?
     var onPrimerErrorCallback: RCTResponseSenderBlock?
@@ -60,6 +61,10 @@ class PrimerRN: NSObject {
         self.onTokenizeSuccessCallback = callback
     }
     
+    @objc func configureOnResumeSuccess(_ callback: @escaping RCTResponseSenderBlock) {
+        self.onResumeSuccessCallback = callback
+    }
+    
     @objc func configureOnVaultSuccess(_ callback: @escaping RCTResponseSenderBlock) {
         self.onVaultSuccessCallback = callback
     }
@@ -122,7 +127,6 @@ class PrimerRN: NSObject {
                 Primer.shared.delegate = self
                 Primer.shared.configure(settings: settings, theme: theme)
                 Primer.shared.showCheckout(viewController, flow: flow)
-                
             } catch {
                 self?.checkoutFailed(with: error)
             }
@@ -135,10 +139,12 @@ class PrimerRN: NSObject {
                 let json = request.data(using: .utf8)!
                 let request = try JSONDecoder().decode(PrimerResumeRequest.self, from: json)
                 
-                if (request.error) {
-                    self?.onResumeFlowCallback?(ErrorTypeRN.ParseJsonFailed)
+                if let error = request.error {
+                    self?.onResumeFlowCallback?(ErrorRN(message: error), nil)
+                } else if let clientToken = request.token {
+                    self?.onResumeFlowCallback?(nil, clientToken)
                 } else {
-                    self?.onResumeFlowCallback?(nil)
+                    self?.onResumeFlowCallback?(nil, nil)
                 }
                 self?.onResumeFlowCallback = nil
             } catch {

package/ios/ReactNative.m

@@ -11,6 +11,8 @@ RCT_EXTERN_METHOD(configureIntent: (NSString *)request)
 
 RCT_EXTERN_METHOD(configureOnTokenizeSuccess: (RCTResponseSenderBlock)callback)
 
+RCT_EXTERN_METHOD(configureOnResumeSuccess: (RCTResponseSenderBlock)callback)
+
 RCT_EXTERN_METHOD(configureOnVaultSuccess: (RCTResponseSenderBlock)callback)
 
 RCT_EXTERN_METHOD(configureOnDismiss: (RCTResponseSenderBlock)callback)