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

package/src/models/primer-config.ts

@@ -1,47 +1,50 @@
-import type {
-  OnClientSessionActionsCallback,
-  OnDismissCallback,
-  OnPrimerErrorCallback,
-  OnSavedPaymentInstrumentsFetchedCallback,
-  OnTokenAddedToVaultCallback,
-  OnTokenizeSuccessCallback,
-} from './primer-callbacks';
+import type { IClientSessionAction } from 'src/Primer';
+import type { IPrimerError } from 'src/RNPrimer';
+import type { PaymentInstrumentToken } from './payment-instrument-token';
+import type { PrimerResumeHandler } from './primer-request';
 import type { PrimerSettings } from './primer-settings';
 import type { PrimerTheme } from './primer-theme';
 
-export type PrimerConfig = IPrimerConfig;
-interface IPrimerConfig {
+export interface IPrimerConfig {
   /**
    * Include data for different payment methods (e.g. amount or business details)
    */
   settings?: PrimerSettings;
+
   /**
    * Set colors and dimensions for the Primer UI.
    */
   theme?: PrimerTheme;
+
+  // onClientTokenCallback?: (resumeHandler: PrimerResumeHandler) => void;
+
   /**
-   * Use this callback to grab a Primer payment instrument token and complete a payment.
+   * Use this callback to grab a Primer payment instrument and complete a payment.
    */
-  onTokenizeSuccess?: OnTokenizeSuccessCallback;
+  onTokenizeSuccess?: (paymentInstrument: PaymentInstrumentToken, resumeHandler: PrimerResumeHandler) => void;
 
-  onResumeSuccess?: OnTokenizeSuccessCallback;
+  /**
+   * Use this callback to resume a PENDING payment with the token provided.
+   */
+  onResumeSuccess?: (resumeToken: string, resumeHandler: PrimerResumeHandler | null) => void;
 
   /**
    * Use this callback to perform some action when a payment instrument was saved to Primer.
    */
-  onTokenAddedToVault?: OnTokenAddedToVaultCallback;
+  onTokenAddedToVault?: (paymentInstrument: PaymentInstrumentToken) => void;
+
   /**
    * Use this callback to perform some action when the Primer UI is dismissed.
    */
-  onDismiss?: OnDismissCallback;
+  onDismiss?: () => void;
+
   /**
    * Use this callback to perform some action when the SDK throws an error.
    */
-  onError?: OnPrimerErrorCallback;
+  onError?: (err: IPrimerError, resumeHandler: PrimerResumeHandler) => void;
+
   /**
-   * Use this to receive saved payment instruments fetch result.
+   * Use this callback to perform actions on payment methods, like surcharging.
    */
-  onSavedPaymentInstrumentsFetched?: OnSavedPaymentInstrumentsFetchedCallback;
-
-  onClientSessionActions?: OnClientSessionActionsCallback;
+  onClientSessionActions?: (clientSessionActions: IClientSessionAction[], resumeHandler: PrimerResumeHandler | null) => void;
 }

package/src/models/primer-intent.ts

@@ -34,7 +34,7 @@ const paymentMethods = [
 export type SinglePrimerPaymentMethod = typeof paymentMethods[number];
 export interface AnyPrimerPaymentMethodIntent {
   vault: boolean;
-  paymentMethod: 'Any';
+  paymentMethod: SinglePrimerPaymentMethod;
 }
 
 export type PrimerPaymentMethodIntent = ISinglePrimerPaymentMethodIntent;

package/src/models/primer-request.ts

@@ -1,21 +1,7 @@
 export type PrimerResumeHandler = IPrimerResumeHandler;
 
 interface IPrimerResumeHandler {
-  handleError: (error: string) => void;
-
+  handleNewClientToken: (clientToken: string) => void;
+  handleError: (error: Error) => void;
   handleSuccess: () => void;
-
-  handleNewClientToken: (token: string) => void;
-
-  /**
-   * @deprecated This method should not be used
-   * Please use handleError instead.
-   */
-  resumeWithError: (error: string | null) => void;
-
-  /**
-   * @deprecated This method should not be used.
-   * Please use handleSuccess or handleNewClientToken instead.
-   */
-  resumeWithSuccess: (clientToken: string | null) => void;
 }

package/src/models/primer-settings.ts

@@ -1,5 +1,6 @@
 import type { CountryCode } from './utils/countryCode';
 import type { CurrencyCode } from './utils/currencyCode';
+import type { RedirectScheme } from './utils/redirectScheme';
 
 export type PrimerSettings = IPrimerSettings;
 interface IPrimerSettings {
@@ -20,7 +21,7 @@ interface IOrder {
 
 interface IOrderItem {
   name: string;
-  unitAmount?: number;
+  amount: number;
   quantity: number;
   isPending?: boolean;
 }
@@ -46,10 +47,11 @@ interface IOptions {
   isResultScreenEnabled?: boolean;
   isLoadingScreenEnabled?: boolean;
   isFullScreenEnabled?: boolean;
-  isThreeDsEnabled?: boolean;
+  is3DSOnVaultingEnabled?: boolean;
+  is3DSDevelopmentModeEnabled?: boolean;
   locale?: string;
   ios?: IIosOptions;
-  android?: IAndroidOptions;
+  redirectScheme?: RedirectScheme;
 }
 
 interface IIosOptions {
@@ -57,9 +59,6 @@ interface IIosOptions {
   urlSchemeIdentifier?: string;
   merchantIdentifier?: string;
 }
-interface IAndroidOptions {
-  redirectScheme?: string;
-}
 
 interface IAddress {
   line1?: String;

package/src/models/primer.ts

@@ -1,4 +1,4 @@
-import type { PrimerConfig } from './primer-config';
+import type { IPrimerConfig } from './primer-config';
 import type { PrimerPaymentMethodIntent } from './primer-intent';
 
 export interface IPrimer {
@@ -11,7 +11,7 @@ export interface IPrimer {
    * @param config Configuration object for the SDK. Use this to set listeners, theme,
    * and payment method specific settings.
    */
-  showUniversalCheckout(token: String, config: PrimerConfig): void;
+  showUniversalCheckout(token: string | null, config: IPrimerConfig): void;
 
   /**
    * Launch Primer's Vault Manager.
@@ -20,7 +20,7 @@ export interface IPrimer {
    * @param config Configuration object for the SDK. Use this to set listeners, theme,
    * and payment method specific settings.
    */
-  showVaultManager(token: String, config: PrimerConfig): void;
+  showVaultManager(token: string | null, config: IPrimerConfig): void;
 
   /**
    * Launch checkout with a specific payment method
@@ -29,9 +29,9 @@ export interface IPrimer {
    * @param config Configuration for the SDK.
    */
   showPaymentMethod(
-    token: String,
+    token: string | null,
     intent: PrimerPaymentMethodIntent,
-    config: PrimerConfig
+    config: IPrimerConfig
   ): void;
 
   /**

package/src/models/utils/redirectScheme.ts

@@ -0,0 +1,5 @@
+var redirectSchemes = [
+    'primer'
+] as const;
+
+export type RedirectScheme = typeof redirectSchemes[number];

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

@@ -1,83 +0,0 @@
-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>()
-
-class PrimerCardNumberEditTextManager : SimpleViewManager<PrimerCardNumberEditText>() {
-
-  override fun getName(): String {
-    return REACT_CLASS
-  }
-
-  override fun createViewInstance(reactContext: ThemedReactContext): PrimerCardNumberEditText {
-    val editText = PrimerCardNumberEditText(reactContext)
-    return editText
-  }
-
-  companion object {
-    const val REACT_CLASS = "PrimerCardNumberEditText"
-  }
-}
-
-class PrimerCardholderNameEditTextManager : SimpleViewManager<PrimerCardholderNameEditText>() {
-
-  override fun getName(): String {
-    return REACT_CLASS
-  }
-
-  override fun createViewInstance(reactContext: ThemedReactContext): PrimerCardholderNameEditText {
-    return PrimerCardholderNameEditText(reactContext)
-  }
-
-  companion object {
-    const val REACT_CLASS = "PrimerCardholderNameEditText"
-  }
-}
-
-class PrimerExpiryEditTextManager : SimpleViewManager<PrimerExpiryEditText>() {
-
-  override fun getName(): String {
-    return REACT_CLASS
-  }
-
-  override fun createViewInstance(reactContext: ThemedReactContext): PrimerExpiryEditText {
-    return PrimerExpiryEditText(reactContext)
-  }
-
-  companion object {
-    const val REACT_CLASS = "PrimerExpiryEditText"
-  }
-}
-
-class PrimerCvvEditTextManager : SimpleViewManager<PrimerCvvEditText>() {
-
-  override fun getName(): String {
-    return REACT_CLASS
-  }
-
-  override fun createViewInstance(reactContext: ThemedReactContext): PrimerCvvEditText {
-    return PrimerCvvEditText(reactContext)
-  }
-
-  companion object {
-    const val REACT_CLASS = "PrimerCvvEditText"
-  }
-}

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

@@ -1,201 +0,0 @@
-package com.primerioreactnative
-
-import androidx.annotation.Nullable
-import androidx.core.content.ContextCompat
-import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.primerioreactnative.datamodels.ErrorTypeRN
-import com.primerioreactnative.datamodels.PrimerErrorRN
-import com.primerioreactnative.datamodels.PrimerPaymentInstrumentTokenRN
-import com.primerioreactnative.datamodels.PrimerSettingsRN
-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.huc.extensions.toArgumentsMap
-import io.primer.android.completion.ResumeHandler
-import io.primer.android.components.PrimerHeadlessUniversalCheckout
-import io.primer.android.components.PrimerHeadlessUniversalCheckoutListener
-import io.primer.android.components.domain.core.models.PrimerHeadlessUniversalCheckoutPaymentMethod
-import io.primer.android.components.ui.assets.ImageType
-import io.primer.android.model.dto.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-
-class PrimerHeadlessUniversalCheckout(
-  private val reactContext: ReactApplicationContext,
-  private val json: Json,
-) : ReactContextBaseJavaModule(reactContext), PrimerHeadlessUniversalCheckoutListener {
-
-  override fun getName(): String {
-    return "PrimerHeadlessUniversalCheckout"
-  }
-
-  private var resumeHandler: ResumeHandler? = null
-  private var successCallback: Callback? = null
-
-  @ReactMethod
-  fun startWithClientToken(
-    clientToken: String,
-    settingsStr: String?,
-    errorCallback: Callback,
-    successCallback: Callback
-  ) {
-    try {
-      val settings = json.decodeFromString<PrimerSettingsRN>(settingsStr.orEmpty())
-      this.successCallback = successCallback
-      PrimerHeadlessUniversalCheckout.current.start(
-        reactContext,
-        clientToken,
-        PrimerConfig(settings = settings.format()),
-        this
-      )
-    } catch (e: Exception) {
-      errorCallback.invoke(
-        json.encodeToString(
-          PrimerErrorRN(
-            ErrorTypeRN.InitFailed,
-            "failed to initialise PrimerHeadlessUniversalCheckout SDK, error: $e",
-          )
-        )
-      )
-    }
-  }
-
-  @ReactMethod
-  fun resumeWithClientToken(resumeToken: String) {
-    this.resumeHandler?.handleNewClientToken(resumeToken)
-  }
-
-  @ReactMethod
-  fun showPaymentMethod(paymentMethodType: String) {
-    val primerPaymentMethodType = PrimerPaymentMethodType.safeValueOf(paymentMethodType)
-    PrimerHeadlessUniversalCheckout.current.showPaymentMethod(
-      reactContext,
-      primerPaymentMethodType
-    )
-  }
-
-  @ReactMethod
-  fun disposeHeadlessCheckout() {
-    PrimerHeadlessUniversalCheckout.current.cleanup()
-  }
-
-  @ReactMethod
-  fun getAssetForPaymentMethodType(
-    paymentMethodType: String,
-    assetType: String,
-    errorCallback: Callback,
-    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(
-            PrimerErrorRN(
-              ErrorTypeRN.AssetMissing,
-              "Asset for $paymentMethodType does not exist, make sure you don't have any typos."
-            )
-          )
-        )
-      }
-      type == null -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            PrimerErrorRN(
-              ErrorTypeRN.AssetMismatch,
-              "You have provided assetType=$assetType, but variable assetType can be 'LOGO' or 'ICON'."
-            )
-          )
-        )
-      }
-      else -> {
-        PrimerHeadlessUniversalCheckout.getAsset(primerPaymentMethodType, 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(
-              PrimerErrorRN(
-                ErrorTypeRN.AssetMissing,
-                "Failed to find $paymentMethodType for $assetType"
-              )
-            )
-          )
-        }
-      }
-    }
-  }
-
-  override fun onClientSessionSetupSuccessfully(paymentMethods: List<PrimerHeadlessUniversalCheckoutPaymentMethod>) {
-    sendEvent(PrimerHeadlessUniversalCheckoutEvent.CLIENT_SESSION_SETUP_SUCCESS)
-    successCallback?.invoke(
-      Arguments.fromList(paymentMethods.map { it.paymentMethodType.name })
-    )
-  }
-
-  override fun onTokenizationPreparation() {
-    sendEvent(PrimerHeadlessUniversalCheckoutEvent.TOKENIZATION_PREPARATION_STARTED)
-  }
-
-  override fun onTokenizationStarted() {
-    sendEvent(PrimerHeadlessUniversalCheckoutEvent.TOKENIZATION_STARTED)
-  }
-
-  override fun onPaymentMethodShowed() {
-    sendEvent(PrimerHeadlessUniversalCheckoutEvent.PAYMENT_METH0D_SHOWED)
-  }
-
-  override fun onTokenizationSuccess(
-    paymentMethodToken: PaymentMethodToken,
-    resumeHandler: ResumeHandler
-  ) {
-    this.resumeHandler = resumeHandler
-
-    sendEvent(
-      PrimerHeadlessUniversalCheckoutEvent.TOKENIZATION_SUCCESS,
-      mapOf(
-        "paymentMethodToken" to json.encodeToString(
-          PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(
-            paymentMethodToken
-          )
-        )
-      ).toArgumentsMap()
-    )
-  }
-
-  override fun onResumeSuccess(resumeToken: String, resumeHandler: ResumeHandler) {
-    this.resumeHandler = resumeHandler
-
-    sendEvent(
-      PrimerHeadlessUniversalCheckoutEvent.RESUME,
-      mapOf("resumeToken" to resumeToken).toArgumentsMap()
-    )
-
-  }
-
-  override fun onError(error: APIError) {
-    sendEvent(
-      PrimerHeadlessUniversalCheckoutEvent.ERROR,
-      mapOf("error" to error.toString()).toArgumentsMap()
-    )
-  }
-
-
-  private fun sendEvent(
-    event: PrimerHeadlessUniversalCheckoutEvent,
-    @Nullable params: WritableMap? = null
-  ) {
-    reactContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit(event.eventName, params)
-  }
-}

package/android/src/main/java/com/primerioreactnative/huc/assets/AssetsManager.kt

@@ -1,56 +0,0 @@
-package com.primerioreactnative.huc.assets
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import com.facebook.react.bridge.ReactApplicationContext
-import java.io.File
-import java.io.FileOutputStream
-import java.util.*
-
-internal object AssetsManager {
-
-  private const val ASSETS_DIRECTORY = "primer-sdk"
-  private const val COMPRESS_QUALITY = 100
-
-  fun drawableToBitmap(drawable: Drawable): Bitmap {
-    if (drawable is BitmapDrawable) {
-      return drawable.bitmap
-    }
-
-    val bitmap = Bitmap.createBitmap(
-      drawable.intrinsicWidth,
-      drawable.intrinsicHeight,
-      Bitmap.Config.ARGB_8888
-    )
-    val canvas = Canvas(bitmap)
-    drawable.setBounds(0, 0, canvas.width, canvas.height)
-    drawable.draw(canvas)
-    return bitmap
-  }
-
-  fun saveBitmapToFile(
-    file: File,
-    bitmap: Bitmap,
-    format: Bitmap.CompressFormat = Bitmap.CompressFormat.PNG,
-  ) {
-
-    FileOutputStream(file).use {
-      bitmap.compress(format, COMPRESS_QUALITY, it)
-      it.close()
-    }
-  }
-
-  fun getFile(context: ReactApplicationContext, path: String): File {
-    val directory = File(context.filesDir, path)
-    if (!directory.exists()) directory.mkdirs()
-    val file = File(
-      context.filesDir,
-      ASSETS_DIRECTORY + File.pathSeparator + path.toLowerCase(Locale.ROOT)
-    )
-    if (!file.exists()) file.createNewFile()
-    return file
-  }
-
-}

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

@@ -1,11 +0,0 @@
-package com.primerioreactnative.huc.events
-
-internal enum class PrimerHeadlessUniversalCheckoutEvent(val eventName: String) {
-  CLIENT_SESSION_SETUP_SUCCESS("clientSessionDidSetUpSuccessfully"),
-  TOKENIZATION_PREPARATION_STARTED("preparationStarted"),
-  PAYMENT_METH0D_SHOWED("paymentMethodPresented"),
-  TOKENIZATION_STARTED("tokenizationStarted"),
-  TOKENIZATION_SUCCESS("tokenizationSucceeded"),
-  RESUME("resume"),
-  ERROR("error");
-}

package/android/src/main/java/com/primerioreactnative/huc/extensions/Map.kt

@@ -1,10 +0,0 @@
-package com.primerioreactnative.huc.extensions
-
-import com.facebook.react.bridge.Arguments
-
-internal fun Map<String, String>.toArgumentsMap() =
-  Arguments.createMap().apply {
-    entries.forEach {
-      putString(it.key, it.value)
-    }
-  }