@stripe/stripe-react-native 0.66.0 → 0.67.0

package/android/gradle.properties

@@ -3,4 +3,4 @@ StripeSdk_compileSdkVersion=36
 StripeSdk_targetSdkVersion=36
 StripeSdk_minSdkVersion=23
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=23.9.+
+StripeSdk_stripeVersion=23.10.+

package/android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt

@@ -1869,17 +1869,6 @@ class StripeSdkModule(
     }
   }
 
-  override fun checkoutUpdateTaxId(
-    sessionKey: String,
-    type: String,
-    value: String,
-    promise: Promise,
-  ) {
-    performCheckoutMutation(sessionKey, promise) { checkout ->
-      checkout.updateTaxId(type = type, value = value)
-    }
-  }
-
   override fun checkoutRunServerUpdateStart(
     sessionKey: String,
     promise: Promise,

package/android/src/main/java/com/reactnativestripesdk/utils/Errors.kt

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.WritableMap
 import com.stripe.android.core.exception.APIException
 import com.stripe.android.core.exception.AuthenticationException
 import com.stripe.android.core.exception.InvalidRequestException
+import com.stripe.android.core.exception.StripeException
 import com.stripe.android.exception.CardException
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
@@ -173,6 +174,16 @@ internal fun createError(
         error.stripeError?.code,
       )
     }
+    is StripeException -> {
+      mapError(
+        code,
+        error.message,
+        error.localizedMessage,
+        error.stripeError?.declineCode,
+        error.stripeError?.type,
+        error.stripeError?.code
+      )
+    }
     else -> mapError(code, error.message, error.localizedMessage.orEmpty(), null, null, null)
   }
 
@@ -197,9 +208,3 @@ internal fun createMissingInitError(): WritableMap =
     "Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component " +
       "or the initStripe method.",
   )
-
-internal fun createOnrampNotConfiguredError(): WritableMap =
-  createError(
-    ErrorType.Failed.toString(),
-    "Onramp is not configured.",
-  )

package/android/src/oldarch/java/com/reactnativestripesdk/NativeOnrampSdkModuleSpec.java

@@ -69,7 +69,7 @@ public abstract class NativeOnrampSdkModuleSpec extends ReactContextBaseJavaModu
 
   @ReactMethod
   @DoNotStrip
-  public abstract void presentCRSCARFDeclaration(Promise promise);
+  public abstract void presentUserAttestation(Promise promise);
 
   @ReactMethod
   @DoNotStrip

package/android/src/oldarch/java/com/reactnativestripesdk/NativeStripeSdkModuleSpec.java

@@ -329,10 +329,6 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void checkoutSelectShippingOption(String sessionKey, String id, Promise promise);
 
-  @ReactMethod
-  @DoNotStrip
-  public abstract void checkoutUpdateTaxId(String sessionKey, String type, String value, Promise promise);
-
   @ReactMethod
   @DoNotStrip
   public abstract void checkoutRunServerUpdateStart(String sessionKey, Promise promise);

package/android/src/onramp/java/com/reactnativestripesdk/OnrampErrors.kt

@@ -0,0 +1,145 @@
+@file:OptIn(ExperimentalCryptoOnramp::class)
+
+package com.reactnativestripesdk
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
+import com.reactnativestripesdk.utils.ErrorType
+import com.stripe.android.core.exception.StripeException
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.exception.AppAttestationException
+import com.stripe.android.crypto.onramp.exception.CryptoOnrampApiException
+import com.stripe.android.crypto.onramp.exception.SDKVersion
+import com.stripe.android.crypto.onramp.exception.StripeCryptoOnrampError
+
+internal fun createOnrampFailedError(error: Throwable): WritableMap =
+  createOnrampError(ErrorType.Failed.toString(), error)
+
+internal fun createOnrampNotConfiguredError(): WritableMap =
+  createOnrampMessageError(
+    ErrorType.Failed.toString(),
+    "Onramp is not configured.",
+  )
+
+private fun createOnrampError(
+  code: String,
+  error: Throwable,
+): WritableMap {
+  val apiException =
+    error as? CryptoOnrampApiException
+      ?: return createNonApiOnrampError(code, error)
+
+  val stripeError = apiException.stripeError
+  val onrampErrorType = apiException.toOnrampErrorType()
+
+  return createOnrampErrorMap(
+    code = code,
+    message = apiException.userMessage,
+    localizedMessage = apiException.localizedMessage,
+    declineCode = stripeError?.declineCode,
+    type = apiException.context.apiErrorType ?: stripeError?.type,
+    stripeErrorCode = apiException.code,
+  ) {
+    putString("onrampErrorType", onrampErrorType)
+    putString("developerMessage", apiException.developerMessage)
+    putString("userMessage", apiException.userMessage)
+    putString("reason", apiException.context.reason)
+    putString("operation", apiException.context.operation)
+    putString("appPackageName", apiException.context.appPackageName)
+    putString("mode", apiException.context.mode)
+    putArray("sdkVersions", mapFromSdkVersions(apiException.sdkVersions))
+    putString("requestId", apiException.context.requestId)
+    putString("apiErrorCode", apiException.context.apiErrorCode)
+    putString("apiErrorType", apiException.context.apiErrorType)
+    putString("apiErrorMessage", apiException.context.apiErrorMessage)
+    putString("apiUserMessage", apiException.context.apiUserMessage)
+    putString("docUrl", apiException.context.docUrl)
+  }
+}
+
+private fun createNonApiOnrampError(
+  code: String,
+  error: Throwable,
+): WritableMap {
+  val onrampError =
+    error as? StripeCryptoOnrampError
+      ?: return createGenericError(code, error)
+
+  return createOnrampErrorMap(
+    code = code,
+    message = onrampError.userMessage,
+    localizedMessage = error.localizedMessage,
+    stripeErrorCode = onrampError.code,
+  ) {
+    putString("developerMessage", onrampError.developerMessage)
+    putString("userMessage", onrampError.userMessage)
+  }
+}
+
+private fun createOnrampMessageError(
+  code: String,
+  message: String?,
+): WritableMap =
+  createOnrampErrorMap(code = code, message = message)
+
+private fun CryptoOnrampApiException.toOnrampErrorType(): String =
+  if (this is AppAttestationException) {
+    "AppAttestationError"
+  } else {
+    "UncategorizedApiError"
+  }
+
+private fun createGenericError(
+  code: String,
+  error: Throwable,
+): WritableMap {
+  val stripeError = (error as? StripeException)?.stripeError
+
+  return createOnrampErrorMap(
+    code = code,
+    message = error.message,
+    localizedMessage = error.localizedMessage,
+    declineCode = stripeError?.declineCode,
+    type = stripeError?.type,
+    stripeErrorCode = stripeError?.code,
+  )
+}
+
+private fun createOnrampErrorMap(
+  code: String,
+  message: String?,
+  localizedMessage: String? = message,
+  declineCode: String? = null,
+  type: String? = null,
+  stripeErrorCode: String? = null,
+  configure: (WritableMap.() -> Unit)? = null,
+): WritableMap {
+  val map: WritableMap = Arguments.createMap()
+  val details: WritableMap = Arguments.createMap()
+
+  details.putString("code", code)
+  details.putString("message", message)
+  details.putString("localizedMessage", localizedMessage)
+  details.putString("declineCode", declineCode)
+  details.putString("type", type)
+  details.putString("stripeErrorCode", stripeErrorCode)
+  configure?.invoke(details)
+
+  map.putMap("error", details)
+  return map
+}
+
+private fun mapFromSdkVersions(
+  sdkVersions: List<SDKVersion>,
+): WritableArray =
+  Arguments.createArray().apply {
+    sdkVersions.forEach { sdkVersion ->
+      pushMap(
+        Arguments.createMap().apply {
+          putString("name", sdkVersion.name)
+          putString("version", sdkVersion.version)
+        },
+      )
+    }
+  }

package/android/src/onramp/java/com/reactnativestripesdk/OnrampMappers.kt

@@ -10,6 +10,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray
 import com.stripe.android.core.model.CountryCode
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.exception.SDKVersion
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
@@ -32,6 +33,7 @@ import com.stripe.android.paymentsheet.PaymentSheet
 internal fun mapConfig(
   configMap: ReadableMap,
   publishableKey: String,
+  additionalSdkVersions: List<SDKVersion> = emptyList(),
 ): OnrampConfiguration {
   val appearanceMap = configMap.getMap("appearance")
   val appearance =
@@ -52,6 +54,11 @@ internal fun mapConfig(
     .appearance(appearance)
     .cryptoCustomerId(cryptoCustomerId)
     .apply { googlePayConfig?.let { googlePayConfig(it) } }
+    .apply {
+      if (additionalSdkVersions.isNotEmpty()) {
+        this.additionalSdkVersions(additionalSdkVersions)
+      }
+    }
 }
 
 @SuppressLint("RestrictedApi")
@@ -222,14 +229,16 @@ internal fun mapFromComplianceIdentifierRequirements(
 ) = Arguments.createMap().apply {
   putArray("identifiers", mapFromComplianceIdentifierRequirementsList(requirements.identifiers))
   putArray("alternatives", mapFromComplianceIdentifierAlternativeGroups(requirements.alternatives))
+  putBoolean("carfTinRequired", requirements.carfTinRequired)
 }
 
 internal fun mapFromSubmitIdentifiersResult(
   result: SubmitIdentifiersResult,
 ) = Arguments.createMap().apply {
-  putBoolean("valid", result.valid)
+  putBoolean("completed", result.completed)
   putArray("identifiers", mapFromComplianceIdentifierRequirementsList(result.identifiers))
   putArray("alternatives", mapFromComplianceIdentifierAlternativeGroups(result.alternatives))
+  putBoolean("carfTinRequired", result.carfTinRequired)
   putArray("invalidIdentifiers", mapFromComplianceIdentifierTypes(result.invalidIdentifiers))
 }
 

package/android/src/onramp/java/com/reactnativestripesdk/OnrampSdkModule.kt

@@ -20,16 +20,15 @@ import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.createCanceledError
 import com.reactnativestripesdk.utils.createEmptyResult
 import com.reactnativestripesdk.utils.createError
-import com.reactnativestripesdk.utils.createFailedError
 import com.reactnativestripesdk.utils.createMissingActivityError
 import com.reactnativestripesdk.utils.createMissingInitError
-import com.reactnativestripesdk.utils.createOnrampNotConfiguredError
 import com.reactnativestripesdk.utils.createResult
 import com.reactnativestripesdk.utils.getStringList
 import com.reactnativestripesdk.utils.getValOr
 import com.reactnativestripesdk.utils.mapToPaymentSheetAddress
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import com.stripe.android.crypto.onramp.OnrampCoordinator
+import com.stripe.android.crypto.onramp.exception.SDKVersion
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
@@ -72,6 +71,7 @@ class OnrampSdkModule(
   reactContext: ReactApplicationContext,
 ) : NativeOnrampSdkModuleSpec(reactContext) {
   private val eventEmitterCompat = EventEmitterCompat(reactContext)
+  private var reactNativeSdkVersion: String? = null
   private lateinit var publishableKey: String
   private var stripeAccountId: String? = null
 
@@ -84,7 +84,7 @@ class OnrampSdkModule(
   private var authorizePromise: Promise? = null
   private var checkoutPromise: Promise? = null
   private var verifyKycPromise: Promise? = null
-  private var crsCarfDeclarationPromise: Promise? = null
+  private var userAttestationPromise: Promise? = null
 
   private var checkoutClientSecretDeferred: CompletableDeferred<String>? = null
   private val rnScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
@@ -96,6 +96,10 @@ class OnrampSdkModule(
   ) {
     // Note: This method depends on `StripeSdkModule#initialise()` being called as well.
     val publishableKey = getValOr(params, "publishableKey", null) as String
+    reactNativeSdkVersion =
+      params.getMap("appInfo")
+        ?.getString("version")
+        ?.takeIf { it.isNotBlank() }
     this.stripeAccountId = getValOr(params, "stripeAccountId", null)
     this.publishableKey = publishableKey
 
@@ -149,8 +153,8 @@ class OnrampSdkModule(
         }.verifyKycCallback { result ->
           handleOnrampKycVerificationResult(result, verifyKycPromise!!)
         }.crsCarfDeclarationCallback { result ->
-          crsCarfDeclarationPromise?.let {
-            handleOnrampCrsCarfDeclarationResult(result, it)
+          userAttestationPromise?.let {
+            handleUserAttestationResult(result, it)
           }
         }.onrampSessionClientSecretProvider { sessionId ->
           checkoutClientSecretDeferred = CompletableDeferred()
@@ -170,7 +174,7 @@ class OnrampSdkModule(
         .also { this.onrampCoordinator = it }
 
     CoroutineScope(Dispatchers.IO).launch {
-      val configuration = mapConfig(config, publishableKey)
+      val configuration = mapConfig(config, publishableKey, onrampAdditionalSdkVersions())
       val configureResult = coordinator.configure(configuration)
 
       CoroutineScope(Dispatchers.Main).launch {
@@ -179,7 +183,7 @@ class OnrampSdkModule(
             createOnrampPresenter(promise)
           }
           is OnrampConfigurationResult.Failed -> {
-            promise.resolve(createError(ErrorType.Failed.toString(), configureResult.error))
+            promise.resolve(createOnrampFailedError(configureResult.error))
           }
         }
       }
@@ -206,7 +210,7 @@ class OnrampSdkModule(
       onrampPresenter = onrampCoordinator!!.createPresenter(activity)
       promise.resolveVoid()
     } catch (e: Exception) {
-      promise.resolve(createFailedError(e))
+      promise.resolve(createOnrampFailedError(e))
     }
   }
 
@@ -226,7 +230,7 @@ class OnrampSdkModule(
           promise.resolveBoolean("hasLinkAccount", result.hasLinkAccount)
         }
         is OnrampHasLinkAccountResult.Failed -> {
-          promise.resolve(createFailedError(result.error))
+          promise.resolve(createOnrampFailedError(result.error))
         }
       }
     }
@@ -257,7 +261,7 @@ class OnrampSdkModule(
           promise.resolveString("customerId", result.customerId)
         }
         is OnrampRegisterLinkUserResult.Failed -> {
-          promise.resolve(createFailedError(result.error))
+          promise.resolve(createOnrampFailedError(result.error))
         }
       }
     }
@@ -286,7 +290,7 @@ class OnrampSdkModule(
           promise.resolveVoid()
         }
         is OnrampRegisterWalletAddressResult.Failed -> {
-          promise.resolve(createFailedError(result.error))
+          promise.resolve(createOnrampFailedError(result.error))
         }
       }
     }
@@ -350,7 +354,7 @@ class OnrampSdkModule(
           promise.resolveVoid()
         }
         is OnrampAttachKycInfoResult.Failed -> {
-          promise.resolve(createFailedError(result.error))
+          promise.resolve(createOnrampFailedError(result.error))
         }
       }
     }
@@ -370,7 +374,7 @@ class OnrampSdkModule(
           promise.resolve(mapFromComplianceIdentifierRequirements(result.requirements))
         }
         is OnrampRetrieveMissingIdentifiersResult.Failed -> {
-          promise.resolve(createFailedError(result.error))
+          promise.resolve(createOnrampFailedError(result.error))
         }
       }
     }
@@ -407,21 +411,21 @@ class OnrampSdkModule(
           promise.resolve(mapFromSubmitIdentifiersResult(result.result))
         }
         is OnrampSubmitIdentifiersResult.Failed -> {
-          promise.resolve(createFailedError(result.error))
+          promise.resolve(createOnrampFailedError(result.error))
         }
       }
     }
   }
 
   @ReactMethod
-  override fun presentCRSCARFDeclaration(promise: Promise) {
+  override fun presentUserAttestation(promise: Promise) {
     val presenter =
       onrampPresenter ?: run {
         promise.resolve(createOnrampNotConfiguredError())
         return
       }
 
-    crsCarfDeclarationPromise = promise
+    userAttestationPromise = promise
     presenter.presentCrsCarfDeclaration()
   }
 
@@ -441,7 +445,7 @@ class OnrampSdkModule(
           promise.resolveVoid()
         }
         is OnrampUpdatePhoneNumberResult.Failed -> {
-          promise.resolve(createFailedError(result.error))
+          promise.resolve(createOnrampFailedError(result.error))
         }
       }
     }
@@ -499,7 +503,7 @@ class OnrampSdkModule(
             platformPayParams.getMap("googlePay")
               ?: run {
                 promise.resolve(
-                  createFailedError(
+                  createOnrampFailedError(
                     IllegalArgumentException("Missing googlePay params in platformPayParams"),
                   ),
                 )
@@ -520,7 +524,7 @@ class OnrampSdkModule(
         }
         else -> {
           promise.resolve(
-            createFailedError(
+            createOnrampFailedError(
               IllegalArgumentException("Unsupported payment method: $paymentMethod"),
             ),
           )
@@ -648,7 +652,7 @@ class OnrampSdkModule(
 
     if (paymentDetails == null) {
       promise.resolve(
-        createFailedError(
+        createOnrampFailedError(
           IllegalArgumentException("Unsupported payment method"),
         ),
       )
@@ -749,7 +753,7 @@ class OnrampSdkModule(
         promise.resolve(createCanceledError("Identity verification was cancelled"))
       }
       is OnrampVerifyIdentityResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -773,12 +777,12 @@ class OnrampSdkModule(
         promise.resolve(createCanceledError("KYC verification was cancelled"))
       }
       is OnrampVerifyKycInfoResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
 
-  private fun handleOnrampCrsCarfDeclarationResult(
+  private fun handleUserAttestationResult(
     result: OnrampCrsCarfDeclarationResult,
     promise: Promise,
   ) {
@@ -789,10 +793,10 @@ class OnrampSdkModule(
         )
       }
       is OnrampCrsCarfDeclarationResult.Cancelled -> {
-        promise.resolve(createCanceledError("CRS/CARF declaration was cancelled"))
+        promise.resolve(createCanceledError("User attestation was canceled"))
       }
       is OnrampCrsCarfDeclarationResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -843,7 +847,7 @@ class OnrampSdkModule(
       }
 
       is OnrampCollectPaymentMethodResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -872,7 +876,7 @@ class OnrampSdkModule(
         promise.resolve(createCanceledError("Authorization was cancelled"))
       }
       is OnrampAuthorizeResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -889,7 +893,7 @@ class OnrampSdkModule(
         promise.resolve(createCanceledError("Checkout was cancelled"))
       }
       is OnrampCheckoutResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -903,7 +907,7 @@ class OnrampSdkModule(
         promise.resolveString("cryptoPaymentToken", result.cryptoPaymentToken)
       }
       is OnrampCreateCryptoPaymentTokenResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -917,7 +921,7 @@ class OnrampSdkModule(
         promise.resolveVoid()
       }
       is OnrampLogOutResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -931,7 +935,7 @@ class OnrampSdkModule(
         promise.resolveVoid()
       }
       is OnrampTokenAuthenticationResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+        promise.resolve(createOnrampFailedError(result.error))
       }
     }
   }
@@ -953,4 +957,14 @@ class OnrampSdkModule(
   ) {
     resolve(WritableNativeMap().apply { putBoolean(key, value) })
   }
+
+  private fun onrampAdditionalSdkVersions(): List<SDKVersion> =
+    reactNativeSdkVersion?.let {
+      listOf(
+        SDKVersion(
+          name = "stripe-react-native",
+          version = it,
+        ),
+      )
+    } ?: emptyList()
 }