@stripe/stripe-react-native 0.44.0 → 0.46.0

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

@@ -1,22 +1,25 @@
 package com.reactnativestripesdk
 
+import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.Application
 import android.content.Intent
+import android.os.Bundle
 import android.util.Log
+import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.BaseActivityEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.reactnativestripesdk.addresssheet.AddressLauncherFragment
+import com.reactnativestripesdk.customersheet.CustomerSheetFragment
 import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
 import com.reactnativestripesdk.utils.ConfirmPaymentErrorType
 import com.reactnativestripesdk.utils.CreateTokenErrorType
@@ -61,6 +64,7 @@ import com.stripe.android.model.SetupIntent
 import com.stripe.android.model.Token
 import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.paymentsheet.PaymentSheet
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -69,9 +73,7 @@ import org.json.JSONObject
 @ReactModule(name = StripeSdkModule.NAME)
 class StripeSdkModule(
   reactContext: ReactApplicationContext,
-) : ReactContextBaseJavaModule(reactContext) {
-  override fun getName(): String = NAME
-
+) : NativeStripeSdkModuleSpec(reactContext) {
   var cardFieldView: CardFieldView? = null
   var cardFormView: CardFormView? = null
 
@@ -89,7 +91,9 @@ class StripeSdkModule(
 
   private var customerSheetFragment: CustomerSheetFragment? = null
 
-  internal var eventListenerCount = 0
+  internal var embeddedIntentCreationCallback = CompletableDeferred<ReadableMap>()
+
+  internal var composeCompatView: StripeAbstractComposeView.CompatView? = null
 
   // If you create a new Fragment, you must put the tag here, otherwise result callbacks for that
   // Fragment will not work on RN < 0.65
@@ -176,17 +180,18 @@ class StripeSdkModule(
     )
   }
 
-  override fun getConstants(): MutableMap<String, Any> =
-    hashMapOf(
+  @SuppressLint("RestrictedApi")
+  override fun getTypedExportedConstants() =
+    mapOf(
       "API_VERSIONS" to
-        hashMapOf(
+        mapOf(
           "CORE" to ApiVersion.API_VERSION_CODE,
           "ISSUING" to PushProvisioningProxy.getApiVersion(),
         ),
     )
 
   @ReactMethod
-  fun initialise(
+  override fun initialise(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -213,21 +218,23 @@ class StripeSdkModule(
     stripe = Stripe(reactApplicationContext, publishableKey, stripeAccountId)
 
     PaymentConfiguration.init(reactApplicationContext, publishableKey, stripeAccountId)
+
+    preventActivityRecreation()
+    setupComposeCompatView()
+
     promise.resolve(null)
   }
 
   @ReactMethod
-  fun initPaymentSheet(
+  override fun initPaymentSheet(
     params: ReadableMap,
     promise: Promise,
   ) {
     getCurrentActivityOrResolveWithError(promise)?.let { activity ->
       paymentSheetFragment?.removeFragment(reactApplicationContext)
+      val bundle = toBundleObject(params)
       paymentSheetFragment =
-        PaymentSheetFragment(reactApplicationContext, promise).also {
-          val bundle = toBundleObject(params)
-          it.arguments = bundle
-        }
+        PaymentSheetFragment.create(reactApplicationContext, bundle, promise)
       try {
         activity.supportFragmentManager
           .beginTransaction()
@@ -240,7 +247,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun presentPaymentSheet(
+  override fun presentPaymentSheet(
     options: ReadableMap,
     promise: Promise,
   ) {
@@ -261,7 +268,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun confirmPaymentSheetPayment(promise: Promise) {
+  override fun confirmPaymentSheetPayment(promise: Promise) {
     if (paymentSheetFragment == null) {
       promise.resolve(PaymentSheetFragment.createMissingInitError())
       return
@@ -271,16 +278,18 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun resetPaymentSheetCustomer(promise: Promise) {
+  override fun resetPaymentSheetCustomer(promise: Promise) {
     PaymentSheet.resetCustomer(context = reactApplicationContext)
     promise.resolve(null)
   }
 
   @ReactMethod
-  fun intentCreationCallback(
+  override fun intentCreationCallback(
     params: ReadableMap,
     promise: Promise,
   ) {
+    embeddedIntentCreationCallback.complete(params)
+
     if (paymentSheetFragment == null) {
       promise.resolve(PaymentSheetFragment.createMissingInitError())
       return
@@ -290,7 +299,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createPaymentMethod(
+  override fun createPaymentMethod(
     data: ReadableMap,
     options: ReadableMap,
     promise: Promise,
@@ -330,7 +339,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createToken(
+  override fun createToken(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -467,7 +476,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createTokenForCVCUpdate(
+  override fun createTokenForCVCUpdate(
     cvc: String,
     promise: Promise,
   ) {
@@ -490,8 +499,9 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun handleNextAction(
+  override fun handleNextAction(
     paymentIntentClientSecret: String,
+    returnUrl: String?,
     promise: Promise,
   ) {
     paymentLauncherFragment =
@@ -506,8 +516,9 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun handleNextActionForSetup(
+  override fun handleNextActionForSetup(
     setupIntentClientSecret: String,
+    returnUrl: String?,
     promise: Promise,
   ) {
     paymentLauncherFragment =
@@ -541,10 +552,10 @@ class StripeSdkModule(
 //  }
 
   @ReactMethod
-  fun confirmPayment(
+  override fun confirmPayment(
     paymentIntentClientSecret: String,
     params: ReadableMap?,
-    options: ReadableMap,
+    options: ReadableMap?,
     promise: Promise,
   ) {
     val paymentMethodData = getMapOrNull(params, "paymentMethodData")
@@ -604,7 +615,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun retrievePaymentIntent(
+  override fun retrievePaymentIntent(
     clientSecret: String,
     promise: Promise,
   ) {
@@ -615,7 +626,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun retrieveSetupIntent(
+  override fun retrieveSetupIntent(
     clientSecret: String,
     promise: Promise,
   ) {
@@ -626,7 +637,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun confirmSetupIntent(
+  override fun confirmSetupIntent(
     setupIntentClientSecret: String,
     params: ReadableMap,
     options: ReadableMap,
@@ -677,13 +688,13 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun isPlatformPaySupported(
+  override fun isPlatformPaySupported(
     params: ReadableMap?,
     promise: Promise,
   ) {
     val googlePayParams = params?.getMap("googlePay")
     val fragment =
-      GooglePayPaymentMethodLauncherFragment(
+      GooglePayPaymentMethodLauncherFragment.create(
         reactApplicationContext,
         getBooleanOrFalse(googlePayParams, "testEnv"),
         getBooleanOrFalse(googlePayParams, "existingPaymentMethodRequired"),
@@ -703,7 +714,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun confirmPlatformPay(
+  override fun confirmPlatformPay(
     clientSecret: String,
     params: ReadableMap,
     isPaymentIntent: Boolean,
@@ -799,7 +810,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createPlatformPayPaymentMethod(
+  override fun createPlatformPayPaymentMethod(
     params: ReadableMap,
     usesDeprecatedTokenFlow: Boolean,
     promise: Promise,
@@ -828,7 +839,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun canAddCardToWallet(
+  override fun canAddCardToWallet(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -862,7 +873,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun isCardInWallet(
+  override fun isCardInWallet(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -886,7 +897,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun collectBankAccount(
+  override fun collectBankAccount(
     isPaymentIntent: Boolean,
     clientSecret: String,
     params: ReadableMap,
@@ -924,7 +935,7 @@ class StripeSdkModule(
       )
 
     collectBankAccountLauncherFragment =
-      CollectBankAccountLauncherFragment(
+      CollectBankAccountLauncherFragment.create(
         reactApplicationContext,
         publishableKey,
         stripeAccountId,
@@ -946,7 +957,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun verifyMicrodeposits(
+  override fun verifyMicrodeposits(
     isPaymentIntent: Boolean,
     clientSecret: String,
     params: ReadableMap,
@@ -1031,7 +1042,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun collectBankAccountToken(
+  override fun collectBankAccountToken(
     clientSecret: String,
     params: ReadableMap,
     promise: Promise,
@@ -1053,7 +1064,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun collectFinancialConnectionsAccounts(
+  override fun collectFinancialConnectionsAccounts(
     clientSecret: String,
     params: ReadableMap,
     promise: Promise,
@@ -1075,7 +1086,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun initCustomerSheet(
+  override fun initCustomerSheet(
     params: ReadableMap,
     customerAdapterOverrides: ReadableMap,
     promise: Promise,
@@ -1107,7 +1118,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun presentCustomerSheet(
+  override fun presentCustomerSheet(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -1121,14 +1132,14 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun retrieveCustomerSheetPaymentOptionSelection(promise: Promise) {
+  override fun retrieveCustomerSheetPaymentOptionSelection(promise: Promise) {
     customerSheetFragment?.retrievePaymentOptionSelection(promise) ?: run {
       promise.resolve(CustomerSheetFragment.createMissingInitError())
     }
   }
 
   @ReactMethod
-  fun customerAdapterFetchPaymentMethodsCallback(
+  override fun customerAdapterFetchPaymentMethodsCallback(
     paymentMethodJsonObjects: ReadableArray,
     promise: Promise,
   ) {
@@ -1152,7 +1163,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterAttachPaymentMethodCallback(
+  override fun customerAdapterAttachPaymentMethodCallback(
     paymentMethodJson: ReadableMap,
     promise: Promise,
   ) {
@@ -1174,7 +1185,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterDetachPaymentMethodCallback(
+  override fun customerAdapterDetachPaymentMethodCallback(
     paymentMethodJson: ReadableMap,
     promise: Promise,
   ) {
@@ -1196,7 +1207,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterSetSelectedPaymentOptionCallback(promise: Promise) {
+  override fun customerAdapterSetSelectedPaymentOptionCallback(promise: Promise) {
     customerSheetFragment?.let {
       it.customerAdapter?.setSelectedPaymentOptionCallback?.complete(Unit)
     } ?: run {
@@ -1206,7 +1217,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterFetchSelectedPaymentOptionCallback(
+  override fun customerAdapterFetchSelectedPaymentOptionCallback(
     paymentOption: String?,
     promise: Promise,
   ) {
@@ -1219,7 +1230,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterSetupIntentClientSecretForCustomerAttachCallback(
+  override fun customerAdapterSetupIntentClientSecretForCustomerAttachCallback(
     clientSecret: String,
     promise: Promise,
   ) {
@@ -1232,26 +1243,70 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun addListener(eventName: String) {
-    eventListenerCount++
+  override fun createEmbeddedPaymentElement(
+    intentConfig: ReadableMap,
+    configuration: ReadableMap,
+    promise: Promise,
+  ) {
+    // TODO:
   }
 
   @ReactMethod
-  fun removeListeners(count: Int) {
-    eventListenerCount -= count
-    if (eventListenerCount < 0) {
-      eventListenerCount = 0
-    }
+  override fun confirmEmbeddedPaymentElement(
+    viewTag: Double,
+    promise: Promise,
+  ) {
+    // noop, iOS only
+  }
+
+  @ReactMethod
+  override fun updateEmbeddedPaymentElement(
+    intentConfig: ReadableMap,
+    promise: Promise,
+  ) {
+    // TODO:
   }
 
-  internal fun sendEvent(
-    reactContext: ReactContext,
-    eventName: String,
-    params: WritableMap,
+  @ReactMethod
+  override fun clearEmbeddedPaymentOption(
+    viewTag: Double,
+    promise: Promise,
   ) {
-    reactContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit(eventName, params)
+    // noop, iOS only
+  }
+
+  override fun handleURLCallback(
+    url: String,
+    promise: Promise,
+  ) {
+    // noop, iOS only.
+  }
+
+  override fun openApplePaySetup(promise: Promise) {
+    // noop, iOS only.
+  }
+
+  override fun configureOrderTracking(
+    orderTypeIdentifier: String,
+    orderIdentifier: String,
+    webServiceUrl: String,
+    authenticationToken: String,
+    promise: Promise,
+  ) {
+    // noop, iOS only.
+  }
+
+  override fun dismissPlatformPay(promise: Promise?) {
+    // noop, iOS only.
+  }
+
+  override fun updatePlatformPaySheet(
+    summaryItems: ReadableArray?,
+    shippingMethods: ReadableArray?,
+    errors: ReadableArray?,
+    promise: Promise?,
+  ) {
+    // noop, iOS only.
   }
 
   /**
@@ -1266,7 +1321,67 @@ class StripeSdkModule(
     return null
   }
 
+  private var isRecreatingActivities = false
+  private val activityLifecycleCallbacks =
+    object : Application.ActivityLifecycleCallbacks {
+      override fun onActivityCreated(
+        activity: Activity,
+        bundle: Bundle?,
+      ) {
+        if (bundle != null) {
+          isRecreatingActivities = true
+        }
+        if (isRecreatingActivities && activity.javaClass.name.startsWith("com.stripe.android")) {
+          activity.finish()
+        }
+      }
+
+      override fun onActivityStarted(activity: Activity) {
+      }
+
+      override fun onActivityResumed(activity: Activity) {
+        isRecreatingActivities = false
+      }
+
+      override fun onActivityPaused(activity: Activity) {
+      }
+
+      override fun onActivityStopped(activity: Activity) {
+      }
+
+      override fun onActivitySaveInstanceState(
+        activity: Activity,
+        bundle: Bundle,
+      ) {
+      }
+
+      override fun onActivityDestroyed(activity: Activity) {
+      }
+    }
+
+  /**
+   * React native apps do not properly handle activity re-creation so make
+   * sure to dismiss any stripe ui when that happens to make sure apps stay
+   * in a consistent state.
+   *
+   * Note that because of some restrictions on some system ui like google
+   * pay this might not always work.
+   */
+  private fun preventActivityRecreation() {
+    currentActivity?.application?.registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
+  }
+
+  private fun setupComposeCompatView() {
+    UiThreadUtil.runOnUiThread {
+      composeCompatView = composeCompatView ?: StripeAbstractComposeView.CompatView(context = reactApplicationContext).also {
+        currentActivity?.findViewById<ViewGroup>(android.R.id.content)?.addView(
+          it,
+        )
+      }
+    }
+  }
+
   companion object {
-    const val NAME = "StripeSdk"
+    const val NAME = NativeStripeSdkModuleSpec.NAME
   }
 }

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

@@ -1,15 +1,44 @@
 package com.reactnativestripesdk
 
-import com.facebook.react.ReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.reactnativestripesdk.addresssheet.AddressSheetViewManager
 import com.reactnativestripesdk.pushprovisioning.AddToWalletButtonManager
 
-class StripeSdkPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
-    listOf<NativeModule>(StripeSdkModule(reactContext))
+// Fool autolinking for older versions that do not support BaseReactPackage.
+// public class StripeSdkPackage implements ReactPackage {
+class StripeSdkPackage : BaseReactPackage() {
+  override fun getModule(
+    name: String,
+    reactContext: ReactApplicationContext,
+  ): NativeModule? =
+    when (name) {
+      StripeSdkModule.NAME -> StripeSdkModule(reactContext)
+      else -> null
+    }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    val moduleList: Array<Class<out NativeModule?>> = arrayOf(StripeSdkModule::class.java)
+    val reactModuleInfoMap: MutableMap<String, ReactModuleInfo> = HashMap()
+    for (moduleClass in moduleList) {
+      val reactModule = moduleClass.getAnnotation(ReactModule::class.java) ?: continue
+      reactModuleInfoMap[reactModule.name] =
+        ReactModuleInfo(
+          reactModule.name,
+          moduleClass.name,
+          true,
+          reactModule.needsEagerInit,
+          reactModule.isCxxModule,
+          BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
+        )
+    }
+    return ReactModuleInfoProvider { reactModuleInfoMap }
+  }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
     listOf<ViewManager<*, *>>(
@@ -20,5 +49,6 @@ class StripeSdkPackage : ReactPackage {
       GooglePayButtonManager(),
       AddToWalletButtonManager(reactContext),
       AddressSheetViewManager(),
+      EmbeddedPaymentElementViewManager(),
     )
 }

package/android/src/main/java/com/reactnativestripesdk/addresssheet/AddressLauncherFragment.kt

@@ -1,22 +1,17 @@
 package com.reactnativestripesdk.addresssheet
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.utils.ErrorType
+import com.reactnativestripesdk.utils.StripeFragment
 import com.reactnativestripesdk.utils.createError
 import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.addresselement.AddressDetails
 import com.stripe.android.paymentsheet.addresselement.AddressLauncher
 import com.stripe.android.paymentsheet.addresselement.AddressLauncherResult
 
-class AddressLauncherFragment : Fragment() {
+class AddressLauncherFragment : StripeFragment() {
   companion object {
     internal var publishableKey: String? = null
     internal const val TAG = "address_launcher_fragment"
@@ -26,16 +21,7 @@ class AddressLauncherFragment : Fragment() {
   private var configuration = AddressLauncher.Configuration()
   private var callback: ((error: WritableMap?, address: AddressDetails?) -> Unit)? = null
 
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-  ): View = FrameLayout(requireActivity()).also { it.visibility = View.GONE }
-
-  override fun onViewCreated(
-    view: View,
-    savedInstanceState: Bundle?,
-  ) {
+  override fun prepare() {
     publishableKey?.let { publishableKey ->
       addressLauncher =
         AddressLauncher(this, ::onAddressLauncherResult).also {