@stripe/stripe-react-native 0.56.0 → 0.57.1

package/android/src/main/java/com/reactnativestripesdk/{PaymentLauncherFragment.kt → PaymentLauncherManager.kt}

@@ -1,20 +1,18 @@
 package com.reactnativestripesdk
 
-import androidx.fragment.app.FragmentActivity
-import com.facebook.react.bridge.Promise
+import android.annotation.SuppressLint
+import androidx.activity.ComponentActivity
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativestripesdk.utils.ConfirmPaymentErrorType
 import com.reactnativestripesdk.utils.ConfirmSetupIntentErrorType
-import com.reactnativestripesdk.utils.ErrorType
-import com.reactnativestripesdk.utils.StripeFragment
+import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
-import com.reactnativestripesdk.utils.createMissingActivityError
 import com.reactnativestripesdk.utils.createResult
 import com.reactnativestripesdk.utils.mapFromPaymentIntentResult
 import com.reactnativestripesdk.utils.mapFromSetupIntentResult
-import com.reactnativestripesdk.utils.removeFragment
 import com.stripe.android.ApiResultCallback
 import com.stripe.android.Stripe
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.model.ConfirmPaymentIntentParams
 import com.stripe.android.model.ConfirmSetupIntentParams
 import com.stripe.android.model.PaymentIntent
@@ -24,12 +22,13 @@ import com.stripe.android.payments.paymentlauncher.PaymentLauncher
 import com.stripe.android.payments.paymentlauncher.PaymentResult
 
 /** Instances of this class should only be initialized with the companion's helper methods. */
-class PaymentLauncherFragment : StripeFragment() {
-  private lateinit var context: ReactApplicationContext
+@OptIn(ReactNativeSdkInternal::class)
+class PaymentLauncherManager(
+  context: ReactApplicationContext,
+) : StripeUIManager(context) {
   private lateinit var stripe: Stripe
   private lateinit var publishableKey: String
   private var stripeAccountId: String? = null
-  private lateinit var promise: Promise
 
   // Used when confirming a payment intent
   private var paymentIntentClientSecret: String? = null
@@ -52,20 +51,17 @@ class PaymentLauncherFragment : StripeFragment() {
       stripe: Stripe,
       publishableKey: String,
       stripeAccountId: String?,
-      promise: Promise,
       paymentIntentClientSecret: String? = null,
       confirmPaymentParams: ConfirmPaymentIntentParams? = null,
       setupIntentClientSecret: String? = null,
       confirmSetupParams: ConfirmSetupIntentParams? = null,
       handleNextActionPaymentIntentClientSecret: String? = null,
       handleNextActionSetupIntentClientSecret: String? = null,
-    ): PaymentLauncherFragment {
-      val instance = PaymentLauncherFragment()
-      instance.context = context
+    ): PaymentLauncherManager {
+      val instance = PaymentLauncherManager(context)
       instance.stripe = stripe
       instance.publishableKey = publishableKey
       instance.stripeAccountId = stripeAccountId
-      instance.promise = promise
       instance.paymentIntentClientSecret = paymentIntentClientSecret
       instance.confirmPaymentParams = confirmPaymentParams
       instance.setupIntentClientSecret = setupIntentClientSecret
@@ -81,21 +77,18 @@ class PaymentLauncherFragment : StripeFragment() {
       stripe: Stripe,
       publishableKey: String,
       stripeAccountId: String?,
-      promise: Promise,
       paymentIntentClientSecret: String,
       confirmPaymentParams: ConfirmPaymentIntentParams,
-    ): PaymentLauncherFragment {
+    ): PaymentLauncherManager {
       val paymentLauncherFragment =
         create(
           context,
           stripe,
           publishableKey,
           stripeAccountId,
-          promise,
           paymentIntentClientSecret = paymentIntentClientSecret,
           confirmPaymentParams = confirmPaymentParams,
         )
-      addFragment(paymentLauncherFragment, context, promise)
       return paymentLauncherFragment
     }
 
@@ -105,21 +98,18 @@ class PaymentLauncherFragment : StripeFragment() {
       stripe: Stripe,
       publishableKey: String,
       stripeAccountId: String?,
-      promise: Promise,
       setupIntentClientSecret: String,
       confirmSetupParams: ConfirmSetupIntentParams,
-    ): PaymentLauncherFragment {
+    ): PaymentLauncherManager {
       val paymentLauncherFragment =
         create(
           context,
           stripe,
           publishableKey,
           stripeAccountId,
-          promise,
           setupIntentClientSecret = setupIntentClientSecret,
           confirmSetupParams = confirmSetupParams,
         )
-      addFragment(paymentLauncherFragment, context, promise)
       return paymentLauncherFragment
     }
 
@@ -129,19 +119,16 @@ class PaymentLauncherFragment : StripeFragment() {
       stripe: Stripe,
       publishableKey: String,
       stripeAccountId: String?,
-      promise: Promise,
       handleNextActionPaymentIntentClientSecret: String,
-    ): PaymentLauncherFragment {
+    ): PaymentLauncherManager {
       val paymentLauncherFragment =
         create(
           context,
           stripe,
           publishableKey,
           stripeAccountId,
-          promise,
           handleNextActionPaymentIntentClientSecret = handleNextActionPaymentIntentClientSecret,
         )
-      addFragment(paymentLauncherFragment, context, promise)
       return paymentLauncherFragment
     }
 
@@ -151,44 +138,23 @@ class PaymentLauncherFragment : StripeFragment() {
       stripe: Stripe,
       publishableKey: String,
       stripeAccountId: String?,
-      promise: Promise,
       handleNextActionSetupIntentClientSecret: String,
-    ): PaymentLauncherFragment {
+    ): PaymentLauncherManager {
       val paymentLauncherFragment =
         create(
           context,
           stripe,
           publishableKey,
           stripeAccountId,
-          promise,
           handleNextActionSetupIntentClientSecret = handleNextActionSetupIntentClientSecret,
         )
-      addFragment(paymentLauncherFragment, context, promise)
       return paymentLauncherFragment
     }
-
-    private fun addFragment(
-      fragment: PaymentLauncherFragment,
-      context: ReactApplicationContext,
-      promise: Promise,
-    ) {
-      (context.currentActivity as? FragmentActivity)?.let {
-        try {
-          it.supportFragmentManager
-            .beginTransaction()
-            .add(fragment, TAG)
-            .commit()
-        } catch (error: IllegalStateException) {
-          promise.resolve(createError(ErrorType.Failed.toString(), error.message))
-        }
-      } ?: run { promise.resolve(createMissingActivityError()) }
-    }
-
-    internal const val TAG = "payment_launcher_fragment"
   }
 
-  override fun prepare() {
-    paymentLauncher = createPaymentLauncher()
+  override fun onPresent() {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    paymentLauncher = createPaymentLauncher(activity)
     if (paymentIntentClientSecret != null && confirmPaymentParams != null) {
       paymentLauncher.confirm(confirmPaymentParams!!)
     } else if (setupIntentClientSecret != null && confirmSetupParams != null) {
@@ -204,8 +170,9 @@ class PaymentLauncherFragment : StripeFragment() {
     }
   }
 
-  private fun createPaymentLauncher(): PaymentLauncher =
-    PaymentLauncher.create(this, publishableKey, stripeAccountId) { paymentResult ->
+  private fun createPaymentLauncher(activity: ComponentActivity): PaymentLauncher =
+    @SuppressLint("RestrictedApi")
+    PaymentLauncher.create(activity, signal, publishableKey, stripeAccountId) { paymentResult ->
       when (paymentResult) {
         is PaymentResult.Completed -> {
           paymentIntentClientSecret?.let {
@@ -219,14 +186,12 @@ class PaymentLauncherFragment : StripeFragment() {
           } ?: throw Exception("Failed to create Payment Launcher. No client secret provided.")
         }
         is PaymentResult.Canceled -> {
-          promise.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), message = null))
-          removeFragment(context)
+          promise?.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), message = null))
         }
         is PaymentResult.Failed -> {
-          promise.resolve(
+          promise?.resolve(
             createError(ConfirmPaymentErrorType.Failed.toString(), paymentResult.throwable),
           )
-          removeFragment(context)
         }
       }
     }
@@ -241,8 +206,7 @@ class PaymentLauncherFragment : StripeFragment() {
       expand = listOf("payment_method"),
       object : ApiResultCallback<SetupIntent> {
         override fun onError(e: Exception) {
-          promise.resolve(createError(ConfirmSetupIntentErrorType.Failed.toString(), e))
-          removeFragment(context)
+          promise?.resolve(createError(ConfirmSetupIntentErrorType.Failed.toString(), e))
         }
 
         override fun onSuccess(result: SetupIntent) {
@@ -252,19 +216,19 @@ class PaymentLauncherFragment : StripeFragment() {
             StripeIntent.Status.RequiresConfirmation,
             StripeIntent.Status.RequiresCapture,
             -> {
-              promise.resolve(createResult("setupIntent", mapFromSetupIntentResult(result)))
+              promise?.resolve(createResult("setupIntent", mapFromSetupIntentResult(result)))
             }
             StripeIntent.Status.RequiresAction -> {
               if (isNextActionSuccessState(result.nextActionType)) {
-                promise.resolve(createResult("setupIntent", mapFromSetupIntentResult(result)))
+                promise?.resolve(createResult("setupIntent", mapFromSetupIntentResult(result)))
               } else {
                 (result.lastSetupError)?.let {
-                  promise.resolve(
+                  promise?.resolve(
                     createError(ConfirmSetupIntentErrorType.Canceled.toString(), it),
                   )
                 }
                   ?: run {
-                    promise.resolve(
+                    promise?.resolve(
                       createError(
                         ConfirmSetupIntentErrorType.Canceled.toString(),
                         "Setup has been canceled",
@@ -274,7 +238,7 @@ class PaymentLauncherFragment : StripeFragment() {
               }
             }
             StripeIntent.Status.RequiresPaymentMethod -> {
-              promise.resolve(
+              promise?.resolve(
                 createError(
                   ConfirmSetupIntentErrorType.Failed.toString(),
                   result.lastSetupError,
@@ -282,7 +246,7 @@ class PaymentLauncherFragment : StripeFragment() {
               )
             }
             StripeIntent.Status.Canceled -> {
-              promise.resolve(
+              promise?.resolve(
                 createError(
                   ConfirmSetupIntentErrorType.Canceled.toString(),
                   result.lastSetupError,
@@ -290,7 +254,7 @@ class PaymentLauncherFragment : StripeFragment() {
               )
             }
             else -> {
-              promise.resolve(
+              promise?.resolve(
                 createError(
                   ConfirmSetupIntentErrorType.Unknown.toString(),
                   "unhandled error: ${result.status}",
@@ -298,7 +262,6 @@ class PaymentLauncherFragment : StripeFragment() {
               )
             }
           }
-          removeFragment(context)
         }
       },
     )
@@ -314,8 +277,7 @@ class PaymentLauncherFragment : StripeFragment() {
       expand = listOf("payment_method"),
       object : ApiResultCallback<PaymentIntent> {
         override fun onError(e: Exception) {
-          promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), e))
-          removeFragment(context)
+          promise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), e))
         }
 
         override fun onSuccess(result: PaymentIntent) {
@@ -325,17 +287,17 @@ class PaymentLauncherFragment : StripeFragment() {
             StripeIntent.Status.RequiresConfirmation,
             StripeIntent.Status.RequiresCapture,
             -> {
-              promise.resolve(createResult("paymentIntent", mapFromPaymentIntentResult(result)))
+              promise?.resolve(createResult("paymentIntent", mapFromPaymentIntentResult(result)))
             }
             StripeIntent.Status.RequiresAction -> {
               if (isNextActionSuccessState(result.nextActionType)) {
-                promise.resolve(createResult("paymentIntent", mapFromPaymentIntentResult(result)))
+                promise?.resolve(createResult("paymentIntent", mapFromPaymentIntentResult(result)))
               } else {
                 (result.lastPaymentError)?.let {
-                  promise.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), it))
+                  promise?.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), it))
                 }
                   ?: run {
-                    promise.resolve(
+                    promise?.resolve(
                       createError(
                         ConfirmPaymentErrorType.Canceled.toString(),
                         "The payment has been canceled",
@@ -345,12 +307,12 @@ class PaymentLauncherFragment : StripeFragment() {
               }
             }
             StripeIntent.Status.RequiresPaymentMethod -> {
-              promise.resolve(
+              promise?.resolve(
                 createError(ConfirmPaymentErrorType.Failed.toString(), result.lastPaymentError),
               )
             }
             StripeIntent.Status.Canceled -> {
-              promise.resolve(
+              promise?.resolve(
                 createError(
                   ConfirmPaymentErrorType.Canceled.toString(),
                   result.lastPaymentError,
@@ -358,7 +320,7 @@ class PaymentLauncherFragment : StripeFragment() {
               )
             }
             else -> {
-              promise.resolve(
+              promise?.resolve(
                 createError(
                   ConfirmPaymentErrorType.Unknown.toString(),
                   "unhandled error: ${result.status}",
@@ -366,7 +328,6 @@ class PaymentLauncherFragment : StripeFragment() {
               )
             }
           }
-          removeFragment(context)
         }
       },
     )
@@ -381,6 +342,7 @@ class PaymentLauncherFragment : StripeFragment() {
       StripeIntent.NextActionType.DisplayOxxoDetails,
       StripeIntent.NextActionType.DisplayBoletoDetails,
       StripeIntent.NextActionType.DisplayKonbiniDetails,
+      StripeIntent.NextActionType.DisplayPayNowDetails,
       StripeIntent.NextActionType.VerifyWithMicrodeposits,
       StripeIntent.NextActionType.DisplayMultibancoDetails,
       StripeIntent.NextActionType.DisplayPayNowDetails,
@@ -394,6 +356,7 @@ class PaymentLauncherFragment : StripeFragment() {
       StripeIntent.NextActionType.UpiAwaitNotification,
       StripeIntent.NextActionType.CashAppRedirect,
       StripeIntent.NextActionType.SwishRedirect,
+      StripeIntent.NextActionType.DisplayPromptPayDetails,
       null,
       -> false
     }

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

@@ -1,12 +1,12 @@
 package com.reactnativestripesdk
 
 import com.facebook.react.bridge.ReadableMap
-import com.reactnativestripesdk.utils.getBooleanOrFalse
-import com.reactnativestripesdk.utils.getMapOrNull
+import com.reactnativestripesdk.utils.getBooleanOr
 import com.reactnativestripesdk.utils.getValOr
 import com.reactnativestripesdk.utils.mapToBillingDetails
 import com.reactnativestripesdk.utils.mapToMetadata
 import com.reactnativestripesdk.utils.mapToPaymentIntentFutureUsage
+import com.reactnativestripesdk.utils.mapToShippingDetails
 import com.reactnativestripesdk.utils.mapToUSBankAccountHolderType
 import com.reactnativestripesdk.utils.mapToUSBankAccountType
 import com.stripe.android.model.ConfirmPaymentIntentParams
@@ -25,11 +25,11 @@ class PaymentMethodCreateParamsFactory(
 ) {
   private val billingDetailsParams =
     mapToBillingDetails(
-      getMapOrNull(paymentMethodData, "billingDetails"),
+      paymentMethodData?.getMap("billingDetails"),
       cardFieldView?.cardAddress ?: cardFormView?.cardAddress,
     )
   private val metadataParams: Map<String, String>? =
-    mapToMetadata(getMapOrNull(paymentMethodData, "metadata"))
+    mapToMetadata(paymentMethodData?.getMap("metadata"))
 
   @Throws(PaymentMethodCreateParamsException::class)
   fun createPaymentMethodParams(paymentMethodType: PaymentMethod.Type): PaymentMethodCreateParams {
@@ -43,7 +43,6 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.Billie -> createBillieParams()
         PaymentMethod.Type.SepaDebit -> createSepaParams()
         PaymentMethod.Type.Oxxo -> createOXXOParams()
-        PaymentMethod.Type.Giropay -> createGiropayParams()
         PaymentMethod.Type.Eps -> createEPSParams()
         PaymentMethod.Type.GrabPay -> createGrabPayParams()
         PaymentMethod.Type.P24 -> createP24Params()
@@ -132,15 +131,6 @@ class PaymentMethodCreateParamsFactory(
     throw PaymentMethodCreateParamsException("You must provide billing details")
   }
 
-  @Throws(PaymentMethodCreateParamsException::class)
-  private fun createGiropayParams(): PaymentMethodCreateParams {
-    billingDetailsParams?.let {
-      return PaymentMethodCreateParams.createGiropay(billingDetails = it, metadata = metadataParams)
-    }
-
-    throw PaymentMethodCreateParamsException("You must provide billing details")
-  }
-
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createEPSParams(): PaymentMethodCreateParams {
     billingDetailsParams?.let {
@@ -167,7 +157,7 @@ class PaymentMethodCreateParamsFactory(
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createFpxParams(): PaymentMethodCreateParams {
-    val bank = getBooleanOrFalse(paymentMethodData, "testOfflineBank").let { "test_offline_bank" }
+    val bank = paymentMethodData.getBooleanOr("testOfflineBank", false).let { "test_offline_bank" }
     return PaymentMethodCreateParams.create(
       PaymentMethodCreateParams.Fpx(bank),
       metadata = metadataParams,
@@ -189,7 +179,7 @@ class PaymentMethodCreateParamsFactory(
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createAuBecsDebitParams(): PaymentMethodCreateParams {
     val formDetails =
-      getMapOrNull(paymentMethodData, "formDetails")
+      paymentMethodData?.getMap("formDetails")
         ?: run { throw PaymentMethodCreateParamsException("You must provide form details") }
 
     val bsbNumber = getValOr(formDetails, "bsbNumber") as String
@@ -266,7 +256,6 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.Billie,
         PaymentMethod.Type.SepaDebit,
         PaymentMethod.Type.Oxxo,
-        PaymentMethod.Type.Giropay,
         PaymentMethod.Type.Eps,
         PaymentMethod.Type.GrabPay,
         PaymentMethod.Type.P24,
@@ -415,10 +404,12 @@ class PaymentMethodCreateParamsFactory(
     }
 
     val params = createAffirmParams()
+    val shippingDetails = mapToShippingDetails(paymentMethodData?.getMap("shippingDetails"))
 
     return ConfirmPaymentIntentParams.createWithPaymentMethodCreateParams(
       paymentMethodCreateParams = params,
       clientSecret = clientSecret,
+      shipping = shippingDetails,
       setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage")),
       mandateData = buildMandateDataParams(),
     )
@@ -455,9 +446,9 @@ class PaymentMethodCreateParamsFactory(
   }
 
   private fun buildMandateDataParams(): MandateDataParams? {
-    getMapOrNull(paymentMethodData, "mandateData")?.let { mandateData ->
-      getMapOrNull(mandateData, "customerAcceptance")?.let { customerAcceptance ->
-        getMapOrNull(customerAcceptance, "online")?.let { onlineParams ->
+    paymentMethodData?.getMap("mandateData")?.let { mandateData ->
+      mandateData.getMap("customerAcceptance")?.let { customerAcceptance ->
+        customerAcceptance.getMap("online")?.let { onlineParams ->
           return MandateDataParams(
             MandateDataParams.Type.Online(
               ipAddress = getValOr(onlineParams, "ipAddress", "") ?: "",

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

@@ -11,8 +11,6 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.TextUnit
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
-import com.reactnativestripesdk.getBase64FromBitmap
-import com.reactnativestripesdk.getBitmapFromDrawable
 import com.reactnativestripesdk.utils.mapFromPaymentSheetBillingDetails
 import com.stripe.android.paymentelement.EmbeddedPaymentElement
 import kotlinx.coroutines.Dispatchers
@@ -50,7 +48,7 @@ suspend fun EmbeddedPaymentElement.PaymentOptionDisplayData.toWritableMap(): Wri
             getBase64FromBitmap(bitmap)
           } ?: ""
         }
-      } catch (e: Exception) {
+      } catch (_: Exception) {
         // If imageLoader fails or times out, return empty string
         ""
       }
@@ -120,17 +118,17 @@ fun AnnotatedString.toHtmlString(): String {
           }
         }
         AnnotationType.STRING_ANNOTATION -> {
-          val stringAnnotation = annotation.data as AnnotatedString.Range<String>
+          val stringAnnotation = annotation.data as AnnotatedString.Range<*>
           when (stringAnnotation.tag) {
             "URL", "LINK_TAG" -> {
               val url = stringAnnotation.item
-              htmlBuilder.append("<a href=\"${escapeHtml(url)}\">")
+              htmlBuilder.append("<a href=\"${escapeHtml(url as String)}\">")
               openTags.add(TagInfo(annotation.end, "</a>"))
             }
           }
         }
         AnnotationType.LINK_ANNOTATION -> {
-          val linkAnnotation = annotation.data as AnnotatedString.Range<LinkAnnotation>
+          val linkAnnotation = annotation.data as AnnotatedString.Range<*>
           when (val linkItem = linkAnnotation.item) {
             is LinkAnnotation.Url -> {
               htmlBuilder.append("<a href=\"${escapeHtml(linkItem.url)}\">")