@primer-io/react-native 2.3.0 → 2.4.0

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.3.0'
+  implementation 'io.primer:android:2.4.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
-      )
-      promise.resolve(null)
-    }
+    PrimerHeadlessUniversalCheckout.current.showPaymentMethod(
+      reactContext,
+      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/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/ios/Headless Universal Checkout/RNTPrimerHeadlessUniversalCheckout.swift

@@ -95,7 +95,7 @@ class RNTPrimerHeadlessUniversalCheckout: RCTEventEmitter {
             if let err = err {
                 errorCallback([err.rnError])
             } else if let paymentMethodTypes = paymentMethodTypes {
-                successCallback([paymentMethodTypes.compactMap({$0.rawValue})])
+                successCallback([paymentMethodTypes])
             }
         }
     }
@@ -106,17 +106,13 @@ class RNTPrimerHeadlessUniversalCheckout: RCTEventEmitter {
                                              errorCallback: @escaping RCTResponseSenderBlock,
                                              successCallback: @escaping RCTResponseSenderBlock)
     {
+        guard let unwrappedAssetType = PrimerAsset.ImageType(rawValue: assetTypeStr), let image = PrimerHeadlessUniversalCheckout.getAsset(for: paymentMethodTypeStr, assetType: unwrappedAssetType) else {
+            let err = NativeError(errorId: "missing-asset", errorDescription: "Failed to find \(assetTypeStr) for \(paymentMethodTypeStr)", recoverySuggestion: nil)
+            errorCallback([err.rnError])
+            return
+        }
+        
         do {
-            try validate(assetStr: paymentMethodTypeStr, assetTypeStr: assetTypeStr)
-            let paymentMethodType = PrimerPaymentMethodType(rawValue: paymentMethodTypeStr)
-            
-            guard let image = PrimerHeadlessUniversalCheckout.getAsset(for: paymentMethodType, assetType: PrimerAsset.ImageType(rawValue: assetTypeStr)!) else {
-                let err = NativeError(errorId: "missing-asset", errorDescription: "Failed to find \(assetTypeStr) for \(paymentMethodTypeStr)", recoverySuggestion: nil)
-                errorCallback([err.rnError])
-                return
-            }
-            
-            
             let imageURL = try self.tempStoreImage(image: image, name: paymentMethodTypeStr)
             successCallback([imageURL.absoluteString])
         } catch {
@@ -130,21 +126,19 @@ class RNTPrimerHeadlessUniversalCheckout: RCTEventEmitter {
                                        errorCallback: @escaping RCTResponseSenderBlock,
                                        successCallback: @escaping RCTResponseSenderBlock)
     {
+        guard let cardNetwork = CardNetwork(rawValue: cardNetworkStr) else {
+            let err = NativeError(errorId: "invalid-card-network", errorDescription: "Card network for \(cardNetworkStr) does not exist, make sure you don't have any typos.", recoverySuggestion: nil)
+            errorCallback([err.rnError])
+            return
+        }
+        
+        guard let unwrappedAssetType = PrimerAsset.ImageType(rawValue: assetTypeStr), let image = PrimerHeadlessUniversalCheckout.getAsset(for: cardNetwork, assetType: unwrappedAssetType) else {
+            let err = NativeError(errorId: "missing-asset", errorDescription: "Failed to find \(assetTypeStr) for \(cardNetworkStr)", recoverySuggestion: nil)
+            errorCallback([err.rnError])
+            return
+        }
+        
         do {
-            try validate(assetStr: cardNetworkStr, assetTypeStr: assetTypeStr)
-            guard let cardNetwork = CardNetwork(rawValue: cardNetworkStr) else {
-                let err = NativeError(errorId: "invalid-card-network", errorDescription: "Card network for \(cardNetworkStr) does not exist, make sure you don't have any typos.", recoverySuggestion: nil)
-                errorCallback([err.rnError])
-                return
-            }
-            
-            guard let image = PrimerHeadlessUniversalCheckout.getAsset(for: cardNetwork, assetType: PrimerAsset.ImageType(rawValue: assetTypeStr)!) else {
-                let err = NativeError(errorId: "missing-asset", errorDescription: "Failed to find \(assetTypeStr) for \(cardNetworkStr)", recoverySuggestion: nil)
-                errorCallback([err.rnError])
-                return
-            }
-            
-            
             let imageURL = try self.tempStoreImage(image: image, name: cardNetworkStr)
             successCallback([imageURL.absoluteString])
         } catch {
@@ -157,8 +151,7 @@ class RNTPrimerHeadlessUniversalCheckout: RCTEventEmitter {
                                   resolver: RCTPromiseResolveBlock,
                                   rejecter: RCTPromiseRejectBlock)
     {
-        let paymentMethodType = PrimerPaymentMethodType(rawValue: paymentMethodTypeStr)
-        PrimerHeadlessUniversalCheckout.current.showPaymentMethod(paymentMethodType)
+        PrimerHeadlessUniversalCheckout.current.showPaymentMethod(paymentMethodTypeStr)
         resolver(nil)
     }
     
@@ -169,36 +162,6 @@ class RNTPrimerHeadlessUniversalCheckout: RCTEventEmitter {
     
     // MARK: - HELPERS
     
-    private func validate(assetStr: String, assetTypeStr: String) throws {
-        var errors: [NativeError] = []
-        
-        if PrimerPaymentMethodType(rawValue: assetStr) != .other(rawValue: assetStr) {
-            // ...
-        } else if CardNetwork(rawValue: assetStr) != nil {
-            // ...
-        } else {
-            let err = NativeError(errorId: "invalid-payment-method-type", errorDescription: "Asset for \(assetStr) does not exist, make sure you don't have any typos.", recoverySuggestion: nil)
-            errors.append(err)
-        }
-        
-        
-        if PrimerAsset.ImageType(rawValue: assetTypeStr) == nil {
-            let err = NativeError(errorId: "mismatch", errorDescription: "You have provided assetType=\(assetTypeStr), which is not valid", recoverySuggestion: "Use one of the following values: \(PrimerAsset.ImageType.allCases.compactMap({ $0.rawValue }))")
-            errors.append(err)
-        }
-        
-        if errors.isEmpty {
-            return
-        } else if errors.count == 1 {
-            throw errors.first!
-        } else {
-            let errorDescription: String = errors.compactMap({ $0.errorDescription }).joined(separator: "/n")
-            let recoverySuggestion = errors.compactMap({ $0.recoverySuggestion }).joined(separator: "/n")
-            let err = NativeError(errorId: "underlying-errors", errorDescription: errorDescription, recoverySuggestion: recoverySuggestion)
-            throw err
-        }
-    }
-    
     private func tempStoreImage(image: UIImage, name: String) throws -> URL {
         guard let imageURL = NSURL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("\(name).png") else {
             let err = NativeError(errorId: "error", errorDescription: "Failed to create URL for asset", recoverySuggestion: nil)

package/ios/RNTPrimer.m

@@ -18,7 +18,7 @@ RCT_EXTERN_METHOD(showUniversalCheckoutWithClientToken:(NSString *)clientToken r
 
 RCT_EXTERN_METHOD(showVaultManagerWithClientToken: (NSString *)clientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
-RCT_EXTERN_METHOD(showPaymentMethod:(NSString *)paymentMethodStr intent:(NSString *)intentStr clientToken:(NSString *)clientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(showPaymentMethod:(NSString *)paymentMethodTypeStr intent:(NSString *)intentStr clientToken:(NSString *)clientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
 RCT_EXTERN_METHOD(dismiss)
 

package/ios/RNTPrimer.swift

@@ -119,22 +119,15 @@ class RNTPrimer: RCTEventEmitter {
     }
     
     @objc
-    public func showPaymentMethod(_ paymentMethodStr: String, intent: String, clientToken: String, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    public func showPaymentMethod(_ paymentMethodTypeStr: String, intent: String, clientToken: String, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
         DispatchQueue.main.async {
             do {
-                let paymentMethodType = PrimerPaymentMethodType(rawValue: paymentMethodStr)
-                
-                guard paymentMethodType != PrimerPaymentMethodType.other(rawValue: paymentMethodStr) else {
-                    let err = NSError(domain: "native-bridge", code: 0, userInfo: [NSLocalizedDescriptionKey: "Payment method type \(paymentMethodStr) is not valid."])
-                    throw err
-                }
-                
                 guard let primerIntent = PrimerSessionIntent(rawValue: intent) else {
                     let err = NSError(domain: "native-bridge", code: 0, userInfo: [NSLocalizedDescriptionKey: "Intent \(intent) is not valid."])
                     throw err
                 }
                 
-                PrimerSDK.Primer.shared.showPaymentMethod(paymentMethodType, withIntent: primerIntent, andClientToken: clientToken) { err in
+                PrimerSDK.Primer.shared.showPaymentMethod(paymentMethodTypeStr, withIntent: primerIntent, andClientToken: clientToken) { err in
                     DispatchQueue.main.async {
                         if let err = err {
                             rejecter(err.rnError["errorId"]!, err.rnError["description"], err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer-io/react-native",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Primer SDK for RN",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/primer-io-react-native.podspec

@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "PrimerSDK", "2.3.0"
+  s.dependency "PrimerSDK", "2.4.0"
 end