@stripe/stripe-react-native 0.66.0 → 0.68.0

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
@@ -40,7 +39,7 @@ import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
-import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
+import com.stripe.android.crypto.onramp.model.OnrampUserAttestationResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
@@ -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
 
@@ -148,9 +152,9 @@ class OnrampSdkModule(
           handleOnrampCheckoutResult(result, checkoutPromise!!)
         }.verifyKycCallback { result ->
           handleOnrampKycVerificationResult(result, verifyKycPromise!!)
-        }.crsCarfDeclarationCallback { result ->
-          crsCarfDeclarationPromise?.let {
-            handleOnrampCrsCarfDeclarationResult(result, it)
+        }.userAttestationCallback { result ->
+          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,22 +411,22 @@ 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
-    presenter.presentCrsCarfDeclaration()
+    userAttestationPromise = promise
+    presenter.presentUserAttestation()
   }
 
   @ReactMethod
@@ -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,26 +777,26 @@ 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(
-    result: OnrampCrsCarfDeclarationResult,
+  private fun handleUserAttestationResult(
+    result: OnrampUserAttestationResult,
     promise: Promise,
   ) {
     when (result) {
-      is OnrampCrsCarfDeclarationResult.Confirmed -> {
+      is OnrampUserAttestationResult.Confirmed -> {
         promise.resolve(
           WritableNativeMap().apply { putString("status", "Confirmed") },
         )
       }
-      is OnrampCrsCarfDeclarationResult.Cancelled -> {
-        promise.resolve(createCanceledError("CRS/CARF declaration was cancelled"))
+      is OnrampUserAttestationResult.Cancelled -> {
+        promise.resolve(createCanceledError("User attestation was canceled"))
       }
-      is OnrampCrsCarfDeclarationResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
+      is OnrampUserAttestationResult.Failed -> {
+        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()
 }

package/android/src/test/java/com/reactnativestripesdk/CurrencySelectorAppearanceTest.kt

@@ -0,0 +1,137 @@
+package com.reactnativestripesdk
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.reactnativestripesdk.utils.readableMapOf
+import com.stripe.android.checkout.Checkout
+import com.stripe.android.paymentelement.CheckoutSessionPreview
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@OptIn(CheckoutSessionPreview::class)
+@RunWith(RobolectricTestRunner::class)
+class CurrencySelectorAppearanceTest {
+  private val context: Context = ApplicationProvider.getApplicationContext()
+
+  @Test
+  fun buildCurrencySelectorAppearance_WithNullMap_ReturnsDefaultAppearance() {
+    val appearance = buildCurrencySelectorAppearance(null, context)
+
+    assertNotNull(appearance)
+  }
+
+  @Test
+  fun buildCurrencySelectorAppearance_WithEmptyMap_ReturnsDefaultAppearance() {
+    val appearance = buildCurrencySelectorAppearance(readableMapOf(), context)
+
+    assertNotNull(appearance)
+  }
+
+  @Test
+  fun buildCurrencySelectorAppearance_WithColorStrings_Success() {
+    val appearance =
+      buildCurrencySelectorAppearance(
+        readableMapOf(
+          "background" to "#111111",
+          "selectedBackground" to "#222222",
+          "borderColor" to "#333333",
+          "textColor" to "#444444",
+          "selectedTextColor" to "#555555",
+          "textSecondaryColor" to "#666666",
+          "dangerColor" to "#777777",
+        ),
+        context,
+      )
+
+    assertNotNull(getField(appearance, "background"))
+    assertNotNull(getField(appearance, "selectedBackground"))
+    assertNotNull(getField(appearance, "borderColor"))
+    assertNotNull(getField(appearance, "textColor"))
+    assertNotNull(getField(appearance, "selectedTextColor"))
+    assertNotNull(getField(appearance, "textSecondaryColor"))
+    assertNotNull(getField(appearance, "dangerColor"))
+  }
+
+  @Test
+  fun buildCurrencySelectorAppearance_WithThemedColor_UsesLightColor() {
+    val appearance =
+      buildCurrencySelectorAppearance(
+        readableMapOf(
+          "textColor" to
+            readableMapOf(
+              "light" to "#000000",
+              "dark" to "#FFFFFF",
+            ),
+        ),
+        context,
+      )
+
+    assertNotNull(getField(appearance, "textColor"))
+  }
+
+  @Test
+  fun buildCurrencySelectorAppearance_WithInvalidColor_IgnoresValue() {
+    val appearance =
+      buildCurrencySelectorAppearance(
+        readableMapOf(
+          "textColor" to "#FF",
+        ),
+        context,
+      )
+
+    // Invalid hex is silently ignored (logged as warning), color remains null/default
+    val field = appearance.javaClass.getDeclaredField("textColor")
+    field.isAccessible = true
+    val textColor = field.get(appearance)
+    assertEquals(null, textColor)
+  }
+
+  @Test
+  fun buildCurrencySelectorAppearance_WithDimensionsAndFont_Success() {
+    val appearance =
+      buildCurrencySelectorAppearance(
+        readableMapOf(
+          "cornerRadius" to 12.0,
+          "borderWidth" to 2.0,
+          "contentVerticalPadding" to 6.0,
+          "font" to
+            readableMapOf(
+              "scale" to 1.2,
+            ),
+        ),
+        context,
+      )
+
+    assertEquals(12f, getField(appearance, "cornerRadiusDp"))
+    assertEquals(2f, getField(appearance, "borderWidthDp"))
+    assertEquals(6f, getField(appearance, "contentVerticalPaddingDp"))
+    assertEquals(1.2f, getField(appearance, "sizeScaleFactor"))
+  }
+
+  @Test
+  fun buildCurrencySelectorAppearance_WithLabelContentValues_Success() {
+    listOf("automatic", "currencyCode", "amount").forEach { labelContent ->
+      val appearance =
+        buildCurrencySelectorAppearance(
+          readableMapOf(
+            "labelContent" to labelContent,
+          ),
+          context,
+        )
+
+      assertNotNull(getField(appearance, "labelContent"))
+    }
+  }
+
+  private fun getField(
+    appearance: Checkout.CurrencySelectorContentAppearance,
+    fieldName: String,
+  ): Any? {
+    val field = appearance.javaClass.getDeclaredField(fieldName)
+    field.isAccessible = true
+    return field.get(appearance)
+  }
+}

package/android/src/test/java/com/reactnativestripesdk/OnrampErrorsTest.kt

@@ -0,0 +1,168 @@
+@file:OptIn(ExperimentalCryptoOnramp::class)
+
+package com.reactnativestripesdk
+
+import com.stripe.android.core.StripeError
+import com.stripe.android.core.exception.APIException
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.exception.APIErrorContext
+import com.stripe.android.crypto.onramp.exception.SDKVersion
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class OnrampErrorsTest {
+  @Test
+  fun createOnrampFailedError_withAppAttestationException_preservesOnrampDiagnostics() {
+    val error =
+      createOnrampException(
+        className = "com.stripe.android.crypto.onramp.exception.AppAttestationException",
+        reason = "android_package_name_mismatch",
+        operation = "configure",
+        appPackageName = "com.example.app",
+        mode = "test",
+        sdkVersions =
+          listOf(
+            SDKVersion(name = "stripe-android", version = "23.9.1"),
+            SDKVersion(name = "stripe-react-native", version = "0.66.0"),
+          ),
+        userMessage = "App attestation failed.",
+        apiErrorCode = "link_failed_to_attest_request",
+        apiErrorType = "api_error",
+        apiErrorMessage = "Attestation request could not be verified.",
+        apiUserMessage = "App attestation failed.",
+        docUrl = "https://docs.stripe.com/errors/app-attestation",
+        requestId = "req_attestation",
+      )
+
+    val details = createOnrampFailedError(error).getMap("error")
+
+    assertNotNull(details)
+    assertEquals("Failed", details!!.getString("code"))
+    assertEquals("AppAttestationError", details.getString("onrampErrorType"))
+    assertEquals("App attestation failed.", details.getString("message"))
+    assertEquals("App attestation failed.", details.getString("localizedMessage"))
+    assertEquals("App attestation failed.", details.getString("userMessage"))
+    assertEquals("link_failed_to_attest_request", details.getString("stripeErrorCode"))
+    assertEquals("link_failed_to_attest_request", details.getString("apiErrorCode"))
+    assertEquals("api_error", details.getString("type"))
+    assertEquals("api_error", details.getString("apiErrorType"))
+    assertEquals("android_package_name_mismatch", details.getString("reason"))
+    assertEquals("configure", details.getString("operation"))
+    assertEquals("com.example.app", details.getString("appPackageName"))
+    assertEquals("test", details.getString("mode"))
+    val sdkVersions = details.getArray("sdkVersions")
+    assertNotNull(sdkVersions)
+    val stripeAndroidVersion = sdkVersions!!.getMap(0)
+    assertEquals("stripe-android", stripeAndroidVersion!!.getString("name"))
+    assertEquals("23.9.1", stripeAndroidVersion.getString("version"))
+    val reactNativeVersion = sdkVersions.getMap(1)
+    assertEquals("stripe-react-native", reactNativeVersion!!.getString("name"))
+    assertEquals("0.66.0", reactNativeVersion.getString("version"))
+    assertEquals("req_attestation", details.getString("requestId"))
+    assertEquals(
+      "Attestation request could not be verified.",
+      details.getString("apiErrorMessage"),
+    )
+    assertEquals("App attestation failed.", details.getString("apiUserMessage"))
+    assertEquals(
+      "https://docs.stripe.com/errors/app-attestation",
+      details.getString("docUrl"),
+    )
+    assertTrue(details.getString("developerMessage")!!.contains("operation: configure"))
+    assertTrue(details.getString("developerMessage")!!.contains("request_id: req_attestation"))
+  }
+
+  @Test
+  fun createOnrampFailedError_withUncategorizedApiError_preservesStripeCodes() {
+    val error =
+      createOnrampException(
+        className = "com.stripe.android.crypto.onramp.exception.UncategorizedApiErrorException",
+        reason = "consumer_session_expired",
+        operation = "authorize",
+        appPackageName = "com.example.app",
+        mode = "live",
+        sdkVersions = listOf(SDKVersion(name = "stripe-android", version = "23.9.1")),
+        userMessage = "Session expired. Please sign in again.",
+        apiErrorCode = "consumer_session_expired",
+        apiErrorType = "authentication_error",
+        apiErrorMessage = "The consumer session has expired.",
+        apiUserMessage = "Session expired. Please sign in again.",
+        docUrl = "https://docs.stripe.com/error-codes/consumer-session-expired",
+        requestId = "req_auth",
+      )
+
+    val details = createOnrampFailedError(error).getMap("error")
+
+    assertNotNull(details)
+    assertEquals("UncategorizedApiError", details!!.getString("onrampErrorType"))
+    assertEquals("consumer_session_expired", details.getString("stripeErrorCode"))
+    assertEquals("authentication_error", details.getString("type"))
+    assertEquals("Session expired. Please sign in again.", details.getString("message"))
+    assertEquals("Session expired. Please sign in again.", details.getString("userMessage"))
+    assertEquals("authorize", details.getString("operation"))
+    assertEquals("req_auth", details.getString("requestId"))
+    assertTrue(details.getString("developerMessage")!!.contains("Code: consumer_session_expired"))
+  }
+
+  private fun createOnrampException(
+    className: String,
+    reason: String,
+    operation: String,
+    appPackageName: String,
+    mode: String,
+    sdkVersions: List<SDKVersion>,
+    userMessage: String,
+    apiErrorCode: String,
+    apiErrorType: String,
+    apiErrorMessage: String,
+    apiUserMessage: String,
+    docUrl: String,
+    requestId: String,
+  ): Exception {
+    val stripeError =
+      StripeError(
+        type = apiErrorType,
+        message = apiErrorMessage,
+        code = apiErrorCode,
+        docUrl = docUrl,
+      )
+    val cause = APIException(stripeError = stripeError, requestId = requestId)
+    val context =
+      APIErrorContext(
+        reason = reason,
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
+        apiErrorMessage = apiErrorMessage,
+        apiUserMessage = apiUserMessage,
+        docUrl = docUrl,
+        underlyingError = cause,
+      )
+
+    // The exception classes in the `com.stripe.android.crypto.onramp.exception` package
+    // don't have public constructors, so we use reflection to create instances for testing.
+    val constructor =
+      Class
+        .forName(className)
+        .getDeclaredConstructor(
+          APIErrorContext::class.java,
+          List::class.java,
+          String::class.java,
+        ).apply {
+          isAccessible = true
+        }
+
+    return constructor.newInstance(
+      context,
+      sdkVersions,
+      userMessage,
+    ) as Exception
+  }
+}