@stripe/stripe-react-native 0.65.0 → 0.66.0

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

@@ -39,7 +39,7 @@ suspend fun EmbeddedPaymentElement.PaymentOptionDisplayData.toWritableMap(): Wri
       try {
         withContext(Dispatchers.Default) {
           val drawable =
-            withTimeout(5_000L) {
+            withTimeout(IMAGE_LOAD_TIMEOUT_MS) {
               withContext(Dispatchers.IO) {
                 imageLoader()
               }
@@ -164,12 +164,12 @@ private fun getHtmlTagsForSpanStyle(spanStyle: SpanStyle): List<Pair<String, Str
   }
 
   spanStyle.color.takeIf { it != Color.Unspecified }?.let { color ->
-    val hexColor = String.format("#%06X", 0xFFFFFF and color.toArgb())
+    val hexColor = String.format("#%06X", RGB_MASK and color.toArgb())
     tags.add("<font color=\"$hexColor\">" to "</font>")
   }
 
   spanStyle.fontSize.takeIf { it != TextUnit.Unspecified }?.let { fontSize ->
-    val emSize = fontSize.value / 16f
+    val emSize = fontSize.value / DEFAULT_FONT_SIZE_SP
     tags.add("<span style=\"font-size: ${emSize}em;\">" to "</span>")
   }
 
@@ -183,7 +183,7 @@ private fun getHtmlTagsForSpanStyle(spanStyle: SpanStyle): List<Pair<String, Str
   }
 
   spanStyle.background.takeIf { it != Color.Unspecified }?.let { bgColor ->
-    val hexBgColor = String.format("#%06X", 0xFFFFFF and bgColor.toArgb())
+    val hexBgColor = String.format("#%06X", RGB_MASK and bgColor.toArgb())
     tags.add("<span style=\"background-color: $hexBgColor;\">" to "</span>")
   }
 
@@ -215,3 +215,7 @@ private data class TagInfo(
   val end: Int,
   val closeTag: String,
 )
+
+private const val IMAGE_LOAD_TIMEOUT_MS = 5_000L
+private const val RGB_MASK = 0xFFFFFF
+private const val DEFAULT_FONT_SIZE_SP = 16f

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

@@ -74,7 +74,7 @@ private fun buildTypography(
 @Throws(PaymentSheetAppearanceException::class)
 private fun colorFromHex(hexString: String?): Int? =
   hexString?.trim()?.replace("#", "")?.let {
-    if (it.length == 6 || it.length == 8) {
+    if (it.length == HEX_COLOR_LENGTH_RGB || it.length == HEX_COLOR_LENGTH_ARGB) {
       "#$it".toColorInt()
     } else {
       throw PaymentSheetAppearanceException(
@@ -474,7 +474,9 @@ private fun buildEmbeddedAppearance(
     }
 
     else -> {
-      System.err.println("WARN: Unsupported embedded payment element row style received: $styleString. Falling back to default.")
+      System.err.println(
+        "WARN: Unsupported embedded payment element row style received: $styleString. Falling back to default."
+      )
     }
   }
   return embeddedBuilder.build()
@@ -554,7 +556,8 @@ internal fun getFontResId(
       )
   if (Regex("[^a-z0-9]").containsMatchIn(fontFileName)) {
     throw PaymentSheetAppearanceException(
-      "$fontErrorPrefix appearance.font.$key should only contain lowercase alphanumeric characters on Android, but received '$fontFileName'. This value must match the filename in android/app/src/main/res/font",
+      "$fontErrorPrefix appearance.font.$key should only contain lowercase alphanumeric characters on Android," +
+        " but received '$fontFileName'. This value must match the filename in android/app/src/main/res/font",
     )
   }
 
@@ -567,6 +570,9 @@ internal fun getFontResId(
   }
 }
 
+private const val HEX_COLOR_LENGTH_RGB = 6
+private const val HEX_COLOR_LENGTH_ARGB = 8
+
 private class PaymentSheetAppearanceKeys {
   companion object {
     const val COLORS = "colors"

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

@@ -2,7 +2,6 @@ package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.Application
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -21,6 +20,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.addresssheet.AddressSheetView
+import com.reactnativestripesdk.utils.DefaultActivityLifecycleCallbacks
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
@@ -39,8 +39,10 @@ import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
+import com.stripe.android.checkout.Checkout
 import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.model.PaymentMethod
+import com.stripe.android.paymentelement.CheckoutSessionPreview
 import com.stripe.android.paymentelement.ConfirmCustomPaymentMethodCallback
 import com.stripe.android.paymentelement.CreateIntentWithConfirmationTokenCallback
 import com.stripe.android.paymentelement.CustomPaymentMethodResult
@@ -61,18 +63,19 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
 import java.io.ByteArrayOutputStream
-import kotlin.Exception
 import kotlin.coroutines.resume
 
 @OptIn(
   ReactNativeSdkInternal::class,
   ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class,
   CardFundingFilteringPrivatePreview::class,
+  CheckoutSessionPreview::class,
 )
 class PaymentSheetManager(
   context: ReactApplicationContext,
   private val arguments: ReadableMap,
   private val initPromise: Promise,
+  private val checkoutInstances: Map<String, Checkout>,
 ) : StripeUIManager(context),
   ConfirmCustomPaymentMethodCallback {
   private var paymentSheet: PaymentSheet? = null
@@ -80,6 +83,7 @@ class PaymentSheetManager(
   private var paymentIntentClientSecret: String? = null
   private var setupIntentClientSecret: String? = null
   private var intentConfiguration: PaymentSheet.IntentConfiguration? = null
+  private var checkoutSessionKey: String? = null
   private lateinit var paymentSheetConfiguration: PaymentSheet.Configuration
   private var confirmPromise: Promise? = null
   private var paymentSheetTimedOut = false
@@ -97,6 +101,7 @@ class PaymentSheetManager(
     super.onDestroy()
     flowController = null
     paymentSheet = null
+    checkoutSessionKey = null
   }
 
   fun configure(
@@ -110,6 +115,10 @@ class PaymentSheetManager(
       )
       return
     }
+    if (!resolveCheckoutSessionOrReturn(args, promise)) {
+      return
+    }
+
     val primaryButtonLabel = args.getString("primaryButtonLabel")
     val googlePayConfig = buildGooglePayConfig(args.getMap("googlePay"))
     val linkConfig = buildLinkConfig(args.getMap("link"))
@@ -121,31 +130,23 @@ class PaymentSheetManager(
       args.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
     val opensCardScannerAutomatically =
       args.getBooleanOr("opensCardScannerAutomatically", false)
+
     paymentIntentClientSecret = args.getString("paymentIntentClientSecret").orEmpty()
     setupIntentClientSecret = args.getString("setupIntentClientSecret").orEmpty()
     intentConfiguration =
-      try {
+      resolvePaymentSheetValue(promise) {
         buildIntentConfiguration(args.getMap("intentConfiguration"))
-      } catch (error: PaymentSheetException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error))
-        return
-      }
+      }.getOrElse { return }
 
     val appearance =
-      try {
+      resolveAppearanceValue(promise) {
         buildPaymentSheetAppearance(args.getMap("appearance"), context)
-      } catch (error: PaymentSheetAppearanceException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error))
-        return
-      }
+      }.getOrElse { return }
 
     val customerConfiguration =
-      try {
+      resolvePaymentSheetValue(promise) {
         buildCustomerConfiguration(args)
-      } catch (error: PaymentSheetException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error))
-        return
-      }
+      }.getOrElse { return }
 
     val shippingDetails =
       args.getMap("defaultShippingDetails")?.let {
@@ -185,19 +186,64 @@ class PaymentSheetManager(
     mapToTermsDisplay(args)?.let { configurationBuilder.termsDisplay(it) }
 
     paymentSheetConfiguration = configurationBuilder.build()
+    configureMode(args, promise)
+  }
+
+  private fun resolveCheckoutSessionOrReturn(
+    args: ReadableMap,
+    promise: Promise,
+  ): Boolean {
+    checkoutSessionKey = args.getMap("checkout")?.getString("sessionKey")
+    val checkoutSessionKey = checkoutSessionKey ?: return true
+    checkoutInstances[checkoutSessionKey] ?: run {
+      promise.resolve(
+        createError(ErrorType.Failed.toString(), "Checkout session not found."),
+      )
+      return false
+    }
+    return true
+  }
+
+  private inline fun <T> resolvePaymentSheetValue(
+    promise: Promise,
+    builder: () -> T,
+  ): Result<T> =
+    try {
+      Result.success(builder())
+    } catch (error: PaymentSheetException) {
+      promise.resolve(createError(ErrorType.Failed.toString(), error))
+      Result.failure(error)
+    }
+
+  private inline fun <T> resolveAppearanceValue(
+    promise: Promise,
+    builder: () -> T,
+  ): Result<T> =
+    try {
+      Result.success(builder())
+    } catch (error: PaymentSheetAppearanceException) {
+      promise.resolve(createError(ErrorType.Failed.toString(), error))
+      Result.failure(error)
+    }
+
+  private fun configureMode(
+    args: ReadableMap,
+    promise: Promise,
+  ) {
     if (args.getBooleanOr("customFlow", false)) {
       lastConfigureWasCustomFlow = true
       if (flowController == null) {
         initFlowController(args, promise)
       }
       configureFlowController(promise)
-    } else {
-      lastConfigureWasCustomFlow = false
-      if (paymentSheet == null) {
-        initPaymentSheet(args, promise)
-      }
-      promise.resolve(Arguments.createMap())
+      return
+    }
+
+    lastConfigureWasCustomFlow = false
+    if (paymentSheet == null) {
+      initPaymentSheet(args, promise)
     }
+    promise.resolve(Arguments.createMap())
   }
 
   private fun initPaymentSheet(
@@ -391,7 +437,10 @@ class PaymentSheetManager(
   override fun onPresent() {
     keepJsAwake = KeepJsAwakeTask(context).apply { start() }
     if (lastConfigureWasCustomFlow == false) {
-      if (!paymentIntentClientSecret.isNullOrEmpty()) {
+      val checkout = getCheckoutInstanceOrResolveError(promise)
+      if (checkout != null) {
+        paymentSheet?.presentWithCheckout(checkout, paymentSheetConfiguration)
+      } else if (!paymentIntentClientSecret.isNullOrEmpty()) {
         paymentSheet?.presentWithPaymentIntent(
           paymentIntentClientSecret!!,
           paymentSheetConfiguration,
@@ -418,31 +467,25 @@ class PaymentSheetManager(
     var paymentSheetActivity: Activity? = null
 
     val activityLifecycleCallbacks =
-      object : Application.ActivityLifecycleCallbacks {
+      object : DefaultActivityLifecycleCallbacks() {
         override fun onActivityCreated(
           activity: Activity,
           savedInstanceState: Bundle?,
         ) {
-          paymentSheetActivity = activity
-        }
-
-        override fun onActivityStarted(activity: Activity) {}
-
-        override fun onActivityResumed(activity: Activity) {}
-
-        override fun onActivityPaused(activity: Activity) {}
-
-        override fun onActivityStopped(activity: Activity) {}
-
-        override fun onActivitySaveInstanceState(
-          activity: Activity,
-          outState: Bundle,
-        ) {
+          if (activity.javaClass.name == PAYMENT_SHEET_ACTIVITY ||
+            activity.javaClass.name == PAYMENT_OPTIONS_ACTIVITY
+          ) {
+            paymentSheetActivity = activity
+          }
         }
 
         override fun onActivityDestroyed(activity: Activity) {
-          paymentSheetActivity = null
-          context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
+          if (activity.javaClass.name == PAYMENT_SHEET_ACTIVITY ||
+            activity.javaClass.name == PAYMENT_OPTIONS_ACTIVITY
+          ) {
+            paymentSheetActivity = null
+            context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
+          }
         }
       }
 
@@ -475,7 +518,14 @@ class PaymentSheetManager(
         handleFlowControllerConfigured(success, error, promise, flowController)
       }
 
-    if (!paymentIntentClientSecret.isNullOrEmpty()) {
+    val checkout = getCheckoutInstanceOrResolveError(promise)
+    if (checkout != null) {
+      flowController?.configureWithCheckout(
+        checkout = checkout,
+        configuration = paymentSheetConfiguration,
+        callback = onFlowControllerConfigure,
+      )
+    } else if (!paymentIntentClientSecret.isNullOrEmpty()) {
       flowController?.configureWithPaymentIntent(
         paymentIntentClientSecret = paymentIntentClientSecret!!,
         configuration = paymentSheetConfiguration,
@@ -504,6 +554,14 @@ class PaymentSheetManager(
     }
   }
 
+  private fun getCheckoutInstanceOrResolveError(promise: Promise?): Checkout? {
+    val checkoutSessionKey = checkoutSessionKey ?: return null
+    return checkoutInstances[checkoutSessionKey] ?: run {
+      promise?.resolve(createError(ErrorType.Failed.toString(), "Checkout session not found."))
+      null
+    }
+  }
+
   private fun resolvePresentPromise(value: Any?) {
     keepJsAwake?.stop()
     promise?.resolve(value)
@@ -550,7 +608,7 @@ class PaymentSheetManager(
     CoroutineScope(Dispatchers.Main).launch {
       try {
         // Give the CustomPaymentMethodActivity a moment to fully initialize
-        delay(100)
+        delay(CUSTOM_PAYMENT_METHOD_INIT_DELAY_MS)
 
         // Emit event so JS can show the Alert and eventually respond via `customPaymentMethodResultCallback`.
         stripeSdkModule.eventEmitter.emitOnCustomPaymentMethodConfirmHandlerCallback(
@@ -596,6 +654,8 @@ class PaymentSheetManager(
         PaymentSheetErrorType.Failed.toString(),
         "No payment sheet has been initialized yet. You must call `initPaymentSheet` before `presentPaymentSheet`.",
       )
+
+    private const val CUSTOM_PAYMENT_METHOD_INIT_DELAY_MS = 100L
   }
 }
 
@@ -627,12 +687,16 @@ suspend fun waitForDrawableToLoad(
             who: Drawable,
             what: Runnable,
             `when`: Long,
-          ) {}
+          ) {
+            // NO-OP
+          }
 
           override fun unscheduleDrawable(
             who: Drawable,
             what: Runnable,
-          ) {}
+          ) {
+            // NO-OP
+          }
         }
 
       drawable.callback = callback
@@ -687,7 +751,7 @@ fun getBase64FromBitmap(bitmap: Bitmap?): String? {
     return null
   }
   val stream = ByteArrayOutputStream()
-  bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
+  bitmap.compress(Bitmap.CompressFormat.PNG, BITMAP_COMPRESS_QUALITY, stream)
   val imageBytes: ByteArray = stream.toByteArray()
   return Base64.encodeToString(imageBytes, Base64.DEFAULT)
 }
@@ -716,7 +780,9 @@ internal fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration
   }
 
 @OptIn(PaymentMethodOptionsSetupFutureUsagePreview::class)
-internal fun mapToPaymentMethodOptions(options: ReadableMap?): PaymentSheet.IntentConfiguration.Mode.Payment.PaymentMethodOptions? {
+internal fun mapToPaymentMethodOptions(
+  options: ReadableMap?
+): PaymentSheet.IntentConfiguration.Mode.Payment.PaymentMethodOptions? {
   val sfuMap = options?.getMap("setupFutureUsageValues")
   val paymentMethodToSfuMap = mutableMapOf<PaymentMethod.Type, PaymentSheet.IntentConfiguration.SetupFutureUse>()
   sfuMap?.forEachKey { code ->
@@ -775,3 +841,7 @@ internal fun handleFlowControllerConfigured(
     promise.resolve(Arguments.createMap())
   }
 }
+
+private const val BITMAP_COMPRESS_QUALITY = 100
+private const val PAYMENT_SHEET_ACTIVITY = "com.stripe.android.paymentsheet.PaymentSheetActivity"
+private const val PAYMENT_OPTIONS_ACTIVITY = "com.stripe.android.paymentsheet.PaymentOptionsActivity"

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

@@ -64,6 +64,7 @@ abstract class StripeAbstractComposeView(
 
     @Composable
     override fun Content() {
+      // NO-OP
     }
   }