@primer-io/react-native 2.16.2 → 2.17.0-rc.1

package/android/.project

@@ -16,12 +16,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1659508366811</id>
+			<id>1666872274961</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

package/android/build.gradle

@@ -4,8 +4,8 @@ buildscript {
 
   repositories {
     google()
+    mavenCentral()
     mavenLocal()
-    jcenter()
   }
 
   dependencies {
@@ -61,7 +61,6 @@ android {
 repositories {
   mavenLocal()
   mavenCentral()
-  jcenter()
   google()
 
   def found = false
@@ -137,5 +136,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.16.2'
+  implementation 'io.primer:android:2.17.0-RC1'
 }

package/android/gradle.properties

@@ -1,4 +1,4 @@
-ReactNative_kotlinVersion=1.6.21
+ReactNative_kotlinVersion=1.7.10
 ReactNative_compileSdkVersion=31
 ReactNative_buildToolsVersion=29.0.2
 ReactNative_targetSdkVersion=31

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

@@ -1,22 +1,7 @@
 package com.primerioreactnative
 
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.GradientDrawable
-import android.view.ViewGroup
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
-import com.facebook.drawee.backends.pipeline.Fresco
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewProps
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.views.image.ReactImageView
-import io.primer.android.components.manager.PrimerCardManager
-import io.primer.android.components.manager.PrimerUniversalCheckoutCardManagerInterface
 import io.primer.android.components.ui.widgets.*
 
 val listOfTextInputs = mutableListOf<PrimerEditText>()

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

@@ -8,14 +8,13 @@ import com.primerioreactnative.utils.PrimerImplementedRNCallbacks
 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.settings.PrimerSettings
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.json.JSONObject
 
-class PrimerRN(private val reactContext: ReactApplicationContext, private val json: Json) :
+class PrimerRN(reactContext: ReactApplicationContext, private val json: Json) :
   ReactContextBaseJavaModule(reactContext) {
   private var mListener = PrimerRNEventListener()
 
@@ -24,6 +23,7 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
     mListener.sendError = { paramsJson -> onError(paramsJson) }
     mListener.sendErrorWithCheckoutData =
       { paramsJson, checkoutData -> onError(paramsJson, checkoutData) }
+    mListener.onDismissedEvent = { Primer.instance.dismiss(true) }
   }
 
   override fun getName(): String = "NativePrimer"
@@ -76,41 +76,14 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
   }
 
   @ReactMethod
-  fun showPaymentMethod(
-    paymentMethodTypeStr: String,
-    intentStr: String,
-    clientToken: String,
-    promise: Promise
-  ) {
-    val intent: PrimerSessionIntent
-    try {
-      intent = PrimerSessionIntent.valueOf(intentStr.uppercase())
-    } catch (e: Exception) {
-      val exception = ErrorTypeRN.NativeBridgeFailed errorTo "Intent $intentStr is not valid."
-      onError(exception)
-      promise.reject(exception.errorId, exception.description, e)
-      return
-    }
-
-    try {
-      Primer.instance.showPaymentMethod(
-        reactApplicationContext.applicationContext,
-        clientToken,
-        paymentMethodTypeStr,
-        intent
-      )
-      promise.resolve(null)
-    } catch (e: Exception) {
-      val exception = ErrorTypeRN.NativeBridgeFailed errorTo
-        "Primer SDK failed: ${e.message}"
-      onError(exception)
-      promise.reject(exception.errorId, exception.description, e)
-    }
+  fun dismiss(promise: Promise) {
+    Primer.instance.dismiss(true)
+    promise.resolve(null)
   }
 
   @ReactMethod
-  fun dismiss(promise: Promise) {
-    Primer.instance.dismiss()
+  fun cleanUp(promise: Promise) {
+    Primer.instance.dismiss(true)
     promise.resolve(null)
   }
 
@@ -192,6 +165,12 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
     }
   }
 
+  @ReactMethod
+  fun addListener(eventName: String?) = Unit
+
+  @ReactMethod
+  fun removeListeners(count: Int?) = Unit
+
   private fun startSdk(settings: PrimerSettings) {
     Primer.instance.configure(settings, mListener)
   }

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

@@ -37,6 +37,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
   var sendError: ((error: PrimerErrorRN) -> Unit)? = null
   var sendErrorWithCheckoutData: ((error: PrimerErrorRN, checkoutData: PrimerCheckoutDataRN?) -> Unit)? =
     null
+  var onDismissedEvent: (() -> Unit)? = null
 
   override fun onCheckoutCompleted(checkoutData: PrimerCheckoutData) {
     if (implementedRNCallbacks?.isOnCheckoutCompleteImplemented == true) {
@@ -91,7 +92,12 @@ class PrimerRNEventListener : PrimerCheckoutListener {
     if (implementedRNCallbacks?.isOnClientSessionUpdateImplemented == true) {
       sendEvent?.invoke(
         PrimerEvents.ON_CLIENT_SESSION_UPDATE.eventName,
-        JSONObject(Json.encodeToString(clientSession.toPrimerClientSessionRN()))
+        JSONObject().apply {
+          put(
+            "clientSession",
+            JSONObject(Json.encodeToString(clientSession.toPrimerClientSessionRN()))
+          )
+        }
       )
     } else {
       super.onClientSessionUpdated(clientSession)
@@ -125,7 +131,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
     resumeToken: String,
     decisionHandler: PrimerResumeDecisionHandler
   ) {
-    if (implementedRNCallbacks?.isOnResumeSuccessImplemented == true) {
+    if (implementedRNCallbacks?.isOnCheckoutResumeImplemented == true) {
       resumeSuccessDecisionHandler = { newClientToken, err ->
         when {
           err != null -> decisionHandler.handleFailure(err.ifBlank { null })
@@ -134,10 +140,9 @@ class PrimerRNEventListener : PrimerCheckoutListener {
         }
       }
 
-      val resumeToken = mapOf(Keys.RESUME_TOKEN to resumeToken)
       sendEvent?.invoke(
         PrimerEvents.ON_RESUME_SUCCESS.eventName,
-        JSONObject(Json.encodeToString(resumeToken))
+        JSONObject(Json.encodeToString(mapOf(Keys.RESUME_TOKEN to resumeToken)))
       )
     } else {
       sendError?.invoke(
@@ -147,8 +152,8 @@ class PrimerRNEventListener : PrimerCheckoutListener {
     }
   }
 
-  override fun onResumePending(additionalInfo: PrimerCheckoutAdditionalInfo?) {
-    if (implementedRNCallbacks?.isOnResumePendingImplemented == true) {
+  override fun onResumePending(additionalInfo: PrimerCheckoutAdditionalInfo) {
+    if (implementedRNCallbacks?.isOnCheckoutPendingImplemented == true) {
       if (additionalInfo is MultibancoCheckoutAdditionalInfo) {
         sendEvent?.invoke(
           PrimerEvents.ON_RESUME_PENDING.eventName,
@@ -166,7 +171,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
   }
 
   override fun onAdditionalInfoReceived(additionalInfo: PrimerCheckoutAdditionalInfo) {
-    if (implementedRNCallbacks?.isOnCheckoutReceivedAdditionalInfo == true) {
+    if (implementedRNCallbacks?.isOnCheckoutAdditionalInfoImplemented == true) {
       if (additionalInfo is PromptPayCheckoutAdditionalInfo) {
         sendEvent?.invoke(
           PrimerEvents.ON_CHECKOUT_RECEIVED_ADDITIONAL_INFO.eventName,
@@ -190,6 +195,8 @@ class PrimerRNEventListener : PrimerCheckoutListener {
         null
       )
     }
+
+    onDismissedEvent?.invoke()
     removeCallbacksAndHandlers()
   }
 
@@ -206,6 +213,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
         PrimerErrorRN(
           error.errorId,
           error.description,
+          error.diagnosticsId,
           error.recoverySuggestion
         ), checkoutData?.toPrimerCheckoutDataRN()
       )
@@ -219,7 +227,14 @@ class PrimerRNEventListener : PrimerCheckoutListener {
       primerErrorDecisionHandler = { errorMessage: String? ->
         errorHandler?.showErrorMessage(errorMessage)
       }
-      sendError?.invoke(PrimerErrorRN(error.errorId, error.description, error.recoverySuggestion))
+      sendError?.invoke(
+        PrimerErrorRN(
+          error.errorId,
+          error.description,
+          error.diagnosticsId,
+          error.recoverySuggestion
+        )
+      )
     } else {
       super.onFailed(error, errorHandler)
     }

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

@@ -1,21 +1,15 @@
 package com.primerioreactnative
 
 import android.util.Log
-import androidx.core.content.ContextCompat
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.primerioreactnative.datamodels.*
-import com.primerioreactnative.huc.assets.AssetsManager
-import com.primerioreactnative.huc.assets.AssetsManager.drawableToBitmap
-import com.primerioreactnative.huc.assets.AssetsManager.getFile
-import com.primerioreactnative.huc.events.PrimerHeadlessUniversalCheckoutEvent
+import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutEvent
 import com.primerioreactnative.utils.PrimerHeadlessUniversalCheckoutImplementedRNCallbacks
 import com.primerioreactnative.utils.convertJsonToMap
 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.ui.CardNetwork
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -44,10 +38,9 @@ class PrimerRNHeadlessUniversalCheckout(
   fun startWithClientToken(
     clientToken: String,
     settingsStr: String?,
-    errorCallback: Callback,
-    successCallback: Callback
+    promise: Promise
   ) {
-    listener.successCallback = successCallback
+    listener.successCallback = promise
     try {
       val settings =
         if (settingsStr.isNullOrBlank()) PrimerSettingsRN() else json.decodeFromString(
@@ -57,108 +50,22 @@ class PrimerRNHeadlessUniversalCheckout(
         reactContext,
         clientToken,
         settings.toPrimerSettings(),
+        listener,
         listener
       )
     } catch (e: Exception) {
-      errorCallback.invoke(
-        json.encodeToString(
-          ErrorTypeRN.NativeBridgeFailed errorTo
-            "failed to initialise PrimerHeadlessUniversalCheckout SDK, error: $e",
-        )
+      promise.reject(
+        ErrorTypeRN.NativeBridgeFailed.errorId,
+        "failed to initialise PrimerHeadlessUniversalCheckout SDK, error: $e",
       )
     }
   }
 
   @ReactMethod
-  fun showPaymentMethod(paymentMethodTypeStr: String, promise: Promise) {
-      PrimerHeadlessUniversalCheckout.current.showPaymentMethod(
-        reactContext,
-        paymentMethodTypeStr
-      )
-      promise.resolve(null)
-  }
-
-  @ReactMethod
-  fun disposePrimerHeadlessUniversalCheckout() {
+  fun cleanUp(promise: Promise) {
     PrimerHeadlessUniversalCheckout.current.cleanup()
     listener.removeCallbacksAndHandlers()
-  }
-
-  @ReactMethod
-  fun getAssetForPaymentMethodType(
-    paymentMethodType: String,
-    assetType: String,
-    errorCallback: Callback,
-    successCallback: Callback
-  ) {
-
-    val type = ImageType.values().find { it.name.equals(assetType, ignoreCase = true) }
-    when {
-      type == null -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            ErrorTypeRN.AssetMismatch errorTo
-              "You have provided assetType=$assetType, but variable assetType can be 'LOGO' or 'ICON'."
-          )
-        )
-      }
-      else -> {
-        PrimerHeadlessUniversalCheckout.getAsset(paymentMethodType, type)?.let { resourceId ->
-          val file = getFile(reactContext, paymentMethodType)
-          AssetsManager.saveBitmapToFile(
-            file,
-            drawableToBitmap(ContextCompat.getDrawable(reactContext, resourceId)!!),
-          )
-          successCallback.invoke("file://${file.absolutePath}")
-        } ?: run {
-          errorCallback.invoke(
-            json.encodeToString(
-              ErrorTypeRN.AssetMissing errorTo
-                "Failed to find $assetType for $paymentMethodType"
-            )
-          )
-        }
-      }
-    }
-  }
-
-  @ReactMethod
-  fun getAssetForCardNetwork(
-    cardNetworkStr: String,
-    assetType: String,
-    errorCallback: Callback,
-    successCallback: Callback
-  ) {
-    val cardNetwork = CardNetwork.Type.values().find { it.name.equals(cardNetworkStr, ignoreCase = true) }
-    val type = ImageType.values().find { it.name.equals(assetType, ignoreCase = true) }
-    when {
-      cardNetwork == null -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            ErrorTypeRN.InvalidCardNetwork errorTo
-              "Card network for $cardNetworkStr does not exist, make sure you don't have any typos."
-          )
-        )
-      }
-      type == null -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            ErrorTypeRN.AssetMismatch errorTo
-              "You have provided assetType=$assetType, but variable assetType can be 'LOGO' or 'ICON'."
-          )
-        )
-      }
-      else -> {
-        PrimerHeadlessUniversalCheckout.getAsset(cardNetwork).let { resourceId ->
-          val file = getFile(reactContext, cardNetworkStr)
-          AssetsManager.saveBitmapToFile(
-                file,
-                drawableToBitmap(ContextCompat.getDrawable(reactContext, resourceId)!!),
-          )
-          successCallback.invoke("file://${file.absolutePath}")
-        }
-      }
-    }
+    promise.resolve(null)
   }
 
   // region tokenization handlers
@@ -167,16 +74,6 @@ class PrimerRNHeadlessUniversalCheckout(
     listener.handleTokenizationNewClientToken(newClientToken)
     promise.resolve(null)
   }
-
-  @ReactMethod
-  fun handleTokenizationSuccess(promise: Promise) {
-    listener.handleTokenizationSuccess(promise)
-  }
-
-  @ReactMethod
-  fun handleTokenizationFailure(errorMessage: String?, promise: Promise) {
-    listener.handleTokenizationFailure(errorMessage.orEmpty(), promise)
-  }
   // endregion
 
   // region resume handlers
@@ -185,17 +82,14 @@ class PrimerRNHeadlessUniversalCheckout(
     listener.handleResumeNewClientToken(newClientToken)
     promise.resolve(null)
   }
+  // endregion
 
+  // region complete handlers
   @ReactMethod
-  fun handleResumeSuccess(promise: Promise) {
-    listener.handleResumeSuccess(promise)
-  }
-
-  @ReactMethod
-  fun handleResumeFailure(errorMessage: String?, promise: Promise) {
-    listener.handleResumeFailure(errorMessage.orEmpty(), promise)
+  fun handleCompleteFlow(promise: Promise) {
+    promise.resolve(null)
   }
-  // endregion
+  // endregion complete handlers
 
   // region payment handlers
   @ReactMethod
@@ -229,6 +123,12 @@ class PrimerRNHeadlessUniversalCheckout(
     }
   }
 
+  @ReactMethod
+  fun addListener(eventName: String?) = Unit
+
+  @ReactMethod
+  fun removeListeners(count: Int?) = Unit
+
   private fun onError(exception: PrimerErrorRN, checkoutDataRN: PrimerCheckoutDataRN? = null) {
     val params = Arguments.createMap()
     val errorJson = JSONObject(Json.encodeToString(exception))