@primer-io/react-native 2.2.1 → 2.5.0

package/android/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1659508366811</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +1,11 @@
 arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.14.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -137,5 +137,5 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
-  implementation 'io.primer:android:2.2.1'
+  implementation 'io.primer:android:2.5.0'
 }

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

@@ -9,7 +9,6 @@ import com.primerioreactnative.utils.convertJsonToMap
 import com.primerioreactnative.utils.errorTo
 import io.primer.android.Primer
 import io.primer.android.PrimerSessionIntent
-import io.primer.android.data.configuration.models.PrimerPaymentMethodType
 import io.primer.android.data.settings.PrimerSettings
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -92,22 +91,12 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
       promise.reject(exception.errorId, exception.description, e)
       return
     }
-    val paymentMethod: PrimerPaymentMethodType
-    try {
-      paymentMethod = getPrimerPaymentMethod(paymentMethodTypeStr)
-    } catch (e: Exception) {
-      val exception =
-        ErrorTypeRN.NativeBridgeFailed errorTo "Payment method type $paymentMethodTypeStr is not valid."
-      onError(exception)
-      promise.reject(exception.errorId, exception.description, e)
-      return
-    }
 
     try {
       Primer.instance.showPaymentMethod(
         reactApplicationContext.applicationContext,
         clientToken,
-        paymentMethod,
+        paymentMethodTypeStr,
         intent
       )
       promise.resolve(null)
@@ -236,14 +225,6 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
   private fun prepareData(data: JSONObject?): WritableMap {
     return data?.let { convertJsonToMap(data) } ?: Arguments.createMap()
   }
-
-  private fun getPrimerPaymentMethod(paymentMethodTypeStr: String): PrimerPaymentMethodType {
-    if (PrimerPaymentMethodType.PAYMENT_CARD.name == paymentMethodTypeStr) {
-      return PrimerPaymentMethodType.PAYMENT_CARD
-    }
-
-    return PrimerPaymentMethodType.valueOf(paymentMethodTypeStr)
-  }
 }
 
 internal object Keys {

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

@@ -15,8 +15,6 @@ import com.primerioreactnative.utils.errorTo
 import io.primer.android.ExperimentalPrimerApi
 import io.primer.android.components.PrimerHeadlessUniversalCheckout
 import io.primer.android.components.ui.assets.ImageType
-import io.primer.android.data.configuration.models.PaymentMethodType
-import io.primer.android.data.configuration.models.PrimerPaymentMethodType
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -72,19 +70,11 @@ class PrimerRNHeadlessUniversalCheckout(
 
   @ReactMethod
   fun showPaymentMethod(paymentMethodTypeStr: String, promise: Promise) {
-    val primerPaymentMethodType = PrimerPaymentMethodType.safeValueOf(paymentMethodTypeStr)
-    if (primerPaymentMethodType == PaymentMethodType.UNKNOWN) {
-      val exception =
-        ErrorTypeRN.NativeBridgeFailed errorTo "Payment method type $paymentMethodTypeStr is not valid."
-      onError(exception)
-      promise.reject(exception.errorId, exception.description)
-    } else {
       PrimerHeadlessUniversalCheckout.current.showPaymentMethod(
         reactContext,
-        primerPaymentMethodType
+        paymentMethodTypeStr
       )
       promise.resolve(null)
-    }
   }
 
   @ReactMethod
@@ -101,17 +91,8 @@ class PrimerRNHeadlessUniversalCheckout(
     successCallback: Callback
   ) {
 
-    val primerPaymentMethodType = PrimerPaymentMethodType.safeValueOf(paymentMethodType)
     val type = ImageType.values().find { it.name.equals(assetType, ignoreCase = true) }
     when {
-      primerPaymentMethodType == PaymentMethodType.UNKNOWN -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            ErrorTypeRN.InvalidPaymentMethodType errorTo
-              "Asset for $paymentMethodType does not exist, make sure you don't have any typos."
-          )
-        )
-      }
       type == null -> {
         errorCallback.invoke(
           json.encodeToString(
@@ -121,7 +102,7 @@ class PrimerRNHeadlessUniversalCheckout(
         )
       }
       else -> {
-        PrimerHeadlessUniversalCheckout.getAsset(primerPaymentMethodType, type)?.let { resourceId ->
+        PrimerHeadlessUniversalCheckout.getAsset(paymentMethodType, type)?.let { resourceId ->
           val file = getFile(reactContext, paymentMethodType)
           AssetsManager.saveBitmapToFile(
             file,

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

@@ -15,7 +15,6 @@ import io.primer.android.completion.PrimerPaymentCreationDecisionHandler
 import io.primer.android.completion.PrimerResumeDecisionHandler
 import io.primer.android.components.PrimerHeadlessUniversalCheckoutListener
 import io.primer.android.components.domain.core.models.PrimerHeadlessUniversalCheckoutPaymentMethod
-import io.primer.android.data.configuration.models.PrimerPaymentMethodType
 import io.primer.android.domain.PrimerCheckoutData
 import io.primer.android.domain.action.models.PrimerClientSession
 import io.primer.android.domain.error.models.PrimerError
@@ -47,29 +46,29 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
     sendEvent?.invoke(
       PrimerHeadlessUniversalCheckoutEvent.ON_HUC_AVAILABLE_PAYMENT_METHODS_LOADED.eventName,
       JSONObject().apply {
-        put("paymentMethodTypes", JSONArray(paymentMethods.map { it.paymentMethodType.name }))
+        put("paymentMethodTypes", JSONArray(paymentMethods.map { it.paymentMethodType }))
       }
     )
     successCallback?.invoke(
-      Arguments.fromList(paymentMethods.map { it.paymentMethodType.name })
+      Arguments.fromList(paymentMethods.map { it.paymentMethodType })
     )
   }
 
-  override fun onPreparationStarted(paymentMethodType: PrimerPaymentMethodType) {
+  override fun onPreparationStarted(paymentMethodType: String) {
     sendEvent?.invoke(
       PrimerHeadlessUniversalCheckoutEvent.ON_HUC_PREPARE_START.eventName,
       JSONObject(Json.encodeToString(PrimerPaymentMethodDataRN(paymentMethodType)))
     )
   }
 
-  override fun onPaymentMethodShowed(paymentMethodType: PrimerPaymentMethodType) {
+  override fun onPaymentMethodShowed(paymentMethodType: String) {
     sendEvent?.invoke(
       PrimerHeadlessUniversalCheckoutEvent.ON_HUC_PAYMENT_METHOD_SHOW.eventName,
       JSONObject(Json.encodeToString(PrimerPaymentMethodDataRN(paymentMethodType)))
     )
   }
 
-  override fun onTokenizationStarted(paymentMethodType: PrimerPaymentMethodType) {
+  override fun onTokenizationStarted(paymentMethodType: String) {
     sendEvent?.invoke(
       PrimerHeadlessUniversalCheckoutEvent.ON_HUC_TOKENIZE_START.eventName,
       JSONObject(Json.encodeToString(PrimerPaymentMethodDataRN(paymentMethodType)))

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

@@ -4,6 +4,7 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
+import com.primerioreactnative.huc.manager.raw.PrimerRNHeadlessUniversalCheckoutRawManager
 import kotlinx.serialization.json.Json
 
 class ReactNativePackage : ReactPackage {
@@ -13,7 +14,8 @@ class ReactNativePackage : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
     return listOf(
       PrimerRN(reactContext, json),
-      PrimerRNHeadlessUniversalCheckout(reactContext, json)
+      PrimerRNHeadlessUniversalCheckout(reactContext, json),
+      PrimerRNHeadlessUniversalCheckoutRawManager(reactContext, json)
     )
   }
 

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

@@ -1,8 +1,6 @@
 package com.primerioreactnative.datamodels
 
-import io.primer.android.data.configuration.models.PrimerPaymentMethodType
-import io.primer.android.domain.tokenization.models.PrimerPaymentMethodData
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PrimerPaymentMethodDataRN(val paymentMethodType: PrimerPaymentMethodType)
+data class PrimerPaymentMethodDataRN(val paymentMethodType: String)

package/android/src/main/java/com/primerioreactnative/huc/datamodels/manager/raw/PrimerRNHeadlessCheckoutInputData.kt

@@ -0,0 +1,22 @@
+package com.primerioreactnative.huc.datamodels.manager.raw
+
+import io.primer.android.components.domain.core.models.card.PrimerRawCardData
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class PrimerRNPrimerRawCardData(
+  val cardNumber: String? = null,
+  val cvv: String? = null,
+  val expiryMonth: String? = null,
+  val expiryYear: String? = null,
+  val cardholderName: String? = null
+) {
+  fun toPrimerCardData() =
+    PrimerRawCardData(
+      cardNumber.orEmpty(),
+      cvv.orEmpty(),
+      expiryMonth.orEmpty(),
+      expiryYear.orEmpty(),
+      cardholderName
+    )
+}

package/android/src/main/java/com/primerioreactnative/huc/events/PrimerHeadlessUniversalCheckoutRawDataManagerEvent.kt

@@ -0,0 +1,7 @@
+package com.primerioreactnative.huc.events
+
+internal enum class PrimerHeadlessUniversalCheckoutRawDataManagerEvent(val eventName: String) {
+  ON_METADATA_CHANGED("onMetadataChange"),
+  ON_VALIDATION_CHANGED("onValidation"),
+  ON_NATIVE_ERROR("onNativeError"),
+}

package/android/src/main/java/com/primerioreactnative/huc/manager/raw/PrimerRNHeadlessUniversalCheckoutRawManager.kt

@@ -0,0 +1,140 @@
+package com.primerioreactnative.huc.manager.raw
+
+import com.facebook.react.bridge.*
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.primerioreactnative.Keys
+import com.primerioreactnative.datamodels.ErrorTypeRN
+import com.primerioreactnative.datamodels.PrimerErrorRN
+import com.primerioreactnative.huc.datamodels.manager.raw.PrimerRNPrimerRawCardData
+import com.primerioreactnative.huc.events.PrimerHeadlessUniversalCheckoutEvent
+import com.primerioreactnative.utils.convertJsonToMap
+import com.primerioreactnative.utils.errorTo
+import io.primer.android.ExperimentalPrimerApi
+import io.primer.android.components.manager.raw.PrimerHeadlessUniversalCheckoutRawDataManager
+import io.primer.android.components.manager.raw.PrimerHeadlessUniversalCheckoutRawDataManagerInterface
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.json.JSONArray
+import org.json.JSONObject
+
+@ExperimentalPrimerApi
+internal class PrimerRNHeadlessUniversalCheckoutRawManager(
+  private val reactContext: ReactApplicationContext,
+  private val json: Json,
+) : ReactContextBaseJavaModule(reactContext) {
+
+  private val listener = PrimerRNHeadlessUniversalCheckoutRawManagerListener()
+  private lateinit var rawManager: PrimerHeadlessUniversalCheckoutRawDataManagerInterface
+
+  init {
+    listener.sendEvent = { eventName, paramsJson -> sendEvent(eventName, paramsJson) }
+  }
+
+  override fun getName() = "PrimerHeadlessUniversalCheckoutRawDataManager"
+
+  @ReactMethod
+  fun initialize(paymentMethodTypeStr: String, promise: Promise) {
+    try {
+      rawManager = PrimerHeadlessUniversalCheckoutRawDataManager.newInstance(
+        paymentMethodTypeStr
+      )
+      rawManager.setManagerListener(listener)
+      promise.resolve(null)
+    } catch (e: Exception) {
+      val exception =
+        ErrorTypeRN.NativeBridgeFailed errorTo e.message.orEmpty()
+      promise.reject(exception.errorId, exception.description)
+    }
+  }
+
+  @ReactMethod
+  fun listRequiredInputElementTypesForPaymentMethodType(
+    paymentMethodTypeStr: String,
+    promise: Promise
+  ) {
+    if (::rawManager.isInitialized.not()) {
+      val exception =
+        ErrorTypeRN.NativeBridgeFailed errorTo "The PrimerHeadlessUniversalCheckoutRawDataManager" +
+          " has not been initialized. Make sure you have called the" +
+          " PrimerHeadlessUniversalCheckoutRawDataManager.configure function first."
+      promise.reject(exception.errorId, exception.description)
+    } else {
+      promise.resolve(
+        prepareData(
+          JSONObject().apply {
+            put(
+              "inputElementTypes",
+              JSONArray(rawManager.getRequiredInputElementTypes().map { it.name })
+            )
+          }
+        )
+      )
+    }
+  }
+
+  @ReactMethod
+  fun setRawData(rawDataStr: String, promise: Promise) {
+    if (::rawManager.isInitialized.not()) {
+      val exception =
+        ErrorTypeRN.NativeBridgeFailed errorTo "The PrimerHeadlessUniversalCheckoutRawDataManager" +
+          " has not been initialized. Make sure you have called the" +
+          " PrimerHeadlessUniversalCheckoutRawDataManager.configure function first."
+      promise.reject(exception.errorId, exception.description)
+    } else {
+      try {
+        val rawData =
+          json.decodeFromString<PrimerRNPrimerRawCardData>(
+            rawDataStr
+          )
+        rawManager.setRawData(rawData.toPrimerCardData())
+        promise.resolve(null)
+      } catch (e: Exception) {
+        val exception =
+          ErrorTypeRN.NativeBridgeFailed errorTo "Failed to decode PrimerCardData on Android." +
+            " Make sure you're providing a valid 'PrimerRawCardData' object"
+        onError(exception)
+        promise.reject(exception.errorId, exception.description, e)
+      }
+    }
+  }
+
+  @ReactMethod
+  fun submit(promise: Promise) {
+    if (::rawManager.isInitialized.not()) {
+      val exception =
+        ErrorTypeRN.NativeBridgeFailed errorTo "The PrimerHeadlessUniversalCheckoutRawDataManager" +
+          " has not been initialized. Make sure you have called the" +
+          " PrimerHeadlessUniversalCheckoutRawDataManager.configure function first."
+      promise.reject(exception.errorId, exception.description)
+    } else {
+      rawManager.submit()
+      promise.resolve(null)
+    }
+  }
+
+  private fun sendEvent(name: String, params: WritableMap) {
+    reactApplicationContext.getJSModule(
+      DeviceEventManagerModule.RCTDeviceEventEmitter::class.java
+    ).emit(name, params)
+  }
+
+  private fun sendEvent(name: String, data: JSONObject?) {
+    val params = prepareData(data)
+    reactApplicationContext.getJSModule(
+      DeviceEventManagerModule.RCTDeviceEventEmitter::class.java
+    ).emit(name, params)
+  }
+
+  private fun prepareData(data: JSONObject?): WritableMap {
+    return data?.let { convertJsonToMap(data) } ?: Arguments.createMap()
+  }
+
+  private fun onError(exception: PrimerErrorRN) {
+    val params = Arguments.createMap()
+    val errorJson = JSONObject(Json.encodeToString(exception))
+    val errorData = prepareData(errorJson)
+    params.putMap(Keys.ERROR, errorData)
+    sendEvent(PrimerHeadlessUniversalCheckoutEvent.ON_ERROR.eventName, params)
+  }
+}

package/android/src/main/java/com/primerioreactnative/huc/manager/raw/PrimerRNHeadlessUniversalCheckoutRawManagerListener.kt

@@ -0,0 +1,49 @@
+package com.primerioreactnative.huc.manager.raw
+
+import com.primerioreactnative.datamodels.PrimerErrorRN
+import com.primerioreactnative.huc.events.PrimerHeadlessUniversalCheckoutRawDataManagerEvent
+import io.primer.android.ExperimentalPrimerApi
+import io.primer.android.components.domain.core.models.card.PrimerCardMetadata
+import io.primer.android.components.domain.core.models.metadata.PrimerPaymentMethodMetadata
+import io.primer.android.components.domain.error.PrimerInputValidationError
+import io.primer.android.components.manager.raw.PrimerHeadlessUniversalCheckoutRawDataManager
+import io.primer.android.components.manager.raw.PrimerHeadlessUniversalCheckoutRawDataManagerListener
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.json.JSONArray
+import org.json.JSONObject
+
+@ExperimentalPrimerApi
+internal class PrimerRNHeadlessUniversalCheckoutRawManagerListener :
+  PrimerHeadlessUniversalCheckoutRawDataManagerListener {
+
+  var sendEvent: ((eventName: String, paramsJson: JSONObject?) -> Unit)? = null
+
+  override fun onValidationChanged(isValid: Boolean, errors: List<PrimerInputValidationError>) {
+    sendEvent?.invoke(
+      PrimerHeadlessUniversalCheckoutRawDataManagerEvent.ON_VALIDATION_CHANGED.eventName,
+      JSONObject().apply {
+        put("isValid", isValid)
+        put(
+          "errors",
+          JSONArray(
+            errors.map {
+              JSONObject(Json.encodeToString(PrimerErrorRN(it.errorId, it.description)))
+            }
+          )
+        )
+      }
+    )
+  }
+
+  override fun onMetadataChanged(metadata: PrimerPaymentMethodMetadata) {
+    sendEvent?.invoke(
+      PrimerHeadlessUniversalCheckoutRawDataManagerEvent.ON_METADATA_CHANGED.eventName,
+      JSONObject().apply {
+        if (metadata is PrimerCardMetadata) {
+          put("cardNetwork", metadata.cardNetwork.name)
+        }
+      }
+    )
+  }
+}

package/ios/DataModels/PrimerErrorRN.swift

@@ -1,4 +1,6 @@
+
 struct NativeError: CustomNSError, LocalizedError, Codable {
+    
     let errorId: String
     let errorDescription: String?
     let recoverySuggestion: String?

package/ios/DataModels/RNTPrimerCardData.swift

@@ -0,0 +1,46 @@
+//
+//  RNTPrimerCardData.swift
+//  primer-io-react-native
+//
+//  Created by Evangelos on 3/8/22.
+//
+
+import Foundation
+import PrimerSDK
+
+extension PrimerCardData {
+    
+    convenience init?(cardDataStr: String) {
+        do {
+            guard let data = cardDataStr.data(using: .utf8) else {
+                return nil
+            }
+            
+            let json = try JSONSerialization.jsonObject(with: data)
+            
+            guard let dict = json as? [String: String] else {
+                return nil
+            }
+            
+            if let cardNumber = dict["cardNumber"],
+               let cvv = dict["cvv"],
+               let expiryMonth = dict["expiryMonth"],
+               let expiryYear = dict["expiryYear"]
+            {
+                let cardholderName = dict["cardholderName"]
+                self.init(
+                    cardNumber: cardNumber,
+                    expiryMonth: expiryMonth,
+                    expiryYear: expiryYear,
+                    cvv: cvv,
+                    cardholderName: cardholderName)
+            } else {
+                return nil
+            }
+            
+        } catch {
+            return nil
+        }
+    }
+    
+}