@stripe/stripe-react-native 0.44.0 → 0.45.0

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

@@ -1,5 +1,6 @@
 package com.reactnativestripesdk
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.util.Log
@@ -7,16 +8,14 @@ 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.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 +60,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 +69,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 +87,7 @@ class StripeSdkModule(
 
   private var customerSheetFragment: CustomerSheetFragment? = null
 
-  internal var eventListenerCount = 0
+  internal var embeddedIntentCreationCallback = CompletableDeferred<ReadableMap>()
 
   // 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 +174,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,
   ) {
@@ -217,7 +216,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun initPaymentSheet(
+  override fun initPaymentSheet(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -240,7 +239,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun presentPaymentSheet(
+  override fun presentPaymentSheet(
     options: ReadableMap,
     promise: Promise,
   ) {
@@ -261,7 +260,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun confirmPaymentSheetPayment(promise: Promise) {
+  override fun confirmPaymentSheetPayment(promise: Promise) {
     if (paymentSheetFragment == null) {
       promise.resolve(PaymentSheetFragment.createMissingInitError())
       return
@@ -271,16 +270,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 +291,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createPaymentMethod(
+  override fun createPaymentMethod(
     data: ReadableMap,
     options: ReadableMap,
     promise: Promise,
@@ -330,7 +331,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createToken(
+  override fun createToken(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -467,7 +468,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createTokenForCVCUpdate(
+  override fun createTokenForCVCUpdate(
     cvc: String,
     promise: Promise,
   ) {
@@ -490,8 +491,9 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun handleNextAction(
+  override fun handleNextAction(
     paymentIntentClientSecret: String,
+    returnUrl: String?,
     promise: Promise,
   ) {
     paymentLauncherFragment =
@@ -506,8 +508,9 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun handleNextActionForSetup(
+  override fun handleNextActionForSetup(
     setupIntentClientSecret: String,
+    returnUrl: String?,
     promise: Promise,
   ) {
     paymentLauncherFragment =
@@ -541,10 +544,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 +607,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun retrievePaymentIntent(
+  override fun retrievePaymentIntent(
     clientSecret: String,
     promise: Promise,
   ) {
@@ -615,7 +618,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun retrieveSetupIntent(
+  override fun retrieveSetupIntent(
     clientSecret: String,
     promise: Promise,
   ) {
@@ -626,7 +629,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun confirmSetupIntent(
+  override fun confirmSetupIntent(
     setupIntentClientSecret: String,
     params: ReadableMap,
     options: ReadableMap,
@@ -677,7 +680,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun isPlatformPaySupported(
+  override fun isPlatformPaySupported(
     params: ReadableMap?,
     promise: Promise,
   ) {
@@ -703,7 +706,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun confirmPlatformPay(
+  override fun confirmPlatformPay(
     clientSecret: String,
     params: ReadableMap,
     isPaymentIntent: Boolean,
@@ -799,7 +802,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun createPlatformPayPaymentMethod(
+  override fun createPlatformPayPaymentMethod(
     params: ReadableMap,
     usesDeprecatedTokenFlow: Boolean,
     promise: Promise,
@@ -828,7 +831,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun canAddCardToWallet(
+  override fun canAddCardToWallet(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -862,7 +865,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun isCardInWallet(
+  override fun isCardInWallet(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -886,7 +889,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun collectBankAccount(
+  override fun collectBankAccount(
     isPaymentIntent: Boolean,
     clientSecret: String,
     params: ReadableMap,
@@ -946,7 +949,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun verifyMicrodeposits(
+  override fun verifyMicrodeposits(
     isPaymentIntent: Boolean,
     clientSecret: String,
     params: ReadableMap,
@@ -1031,7 +1034,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun collectBankAccountToken(
+  override fun collectBankAccountToken(
     clientSecret: String,
     params: ReadableMap,
     promise: Promise,
@@ -1053,7 +1056,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun collectFinancialConnectionsAccounts(
+  override fun collectFinancialConnectionsAccounts(
     clientSecret: String,
     params: ReadableMap,
     promise: Promise,
@@ -1075,7 +1078,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun initCustomerSheet(
+  override fun initCustomerSheet(
     params: ReadableMap,
     customerAdapterOverrides: ReadableMap,
     promise: Promise,
@@ -1107,7 +1110,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun presentCustomerSheet(
+  override fun presentCustomerSheet(
     params: ReadableMap,
     promise: Promise,
   ) {
@@ -1121,14 +1124,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 +1155,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterAttachPaymentMethodCallback(
+  override fun customerAdapterAttachPaymentMethodCallback(
     paymentMethodJson: ReadableMap,
     promise: Promise,
   ) {
@@ -1174,7 +1177,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterDetachPaymentMethodCallback(
+  override fun customerAdapterDetachPaymentMethodCallback(
     paymentMethodJson: ReadableMap,
     promise: Promise,
   ) {
@@ -1196,7 +1199,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterSetSelectedPaymentOptionCallback(promise: Promise) {
+  override fun customerAdapterSetSelectedPaymentOptionCallback(promise: Promise) {
     customerSheetFragment?.let {
       it.customerAdapter?.setSelectedPaymentOptionCallback?.complete(Unit)
     } ?: run {
@@ -1206,7 +1209,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterFetchSelectedPaymentOptionCallback(
+  override fun customerAdapterFetchSelectedPaymentOptionCallback(
     paymentOption: String?,
     promise: Promise,
   ) {
@@ -1219,7 +1222,7 @@ class StripeSdkModule(
   }
 
   @ReactMethod
-  fun customerAdapterSetupIntentClientSecretForCustomerAttachCallback(
+  override fun customerAdapterSetupIntentClientSecretForCustomerAttachCallback(
     clientSecret: String,
     promise: Promise,
   ) {
@@ -1232,26 +1235,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:
+  }
+
+  @ReactMethod
+  override fun clearEmbeddedPaymentOption(
+    viewTag: Double,
+    promise: Promise,
+  ) {
+    // 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.
   }
 
-  internal fun sendEvent(
-    reactContext: ReactContext,
-    eventName: String,
-    params: WritableMap,
+  override fun updatePlatformPaySheet(
+    summaryItems: ReadableArray?,
+    shippingMethods: ReadableArray?,
+    errors: ReadableArray?,
+    promise: Promise?,
   ) {
-    reactContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit(eventName, params)
+    // noop, iOS only.
   }
 
   /**
@@ -1267,6 +1314,6 @@ class StripeSdkModule(
   }
 
   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/AddressSheetView.kt

@@ -84,35 +84,35 @@ class AddressSheetView(
     }
   }
 
-  fun setAppearance(appearanceParams: ReadableMap) {
+  fun setAppearance(appearanceParams: ReadableMap?) {
     this.appearanceParams = appearanceParams
   }
 
-  fun setDefaultValues(defaults: ReadableMap) {
-    defaultAddress = buildAddressDetails(defaults)
+  fun setDefaultValues(defaults: ReadableMap?) {
+    defaultAddress = defaults?.let { buildAddressDetails(it) }
   }
 
-  fun setAdditionalFields(fields: ReadableMap) {
-    additionalFields = buildAdditionalFieldsConfiguration(fields)
+  fun setAdditionalFields(fields: ReadableMap?) {
+    additionalFields = fields?.let { buildAdditionalFieldsConfiguration(it) }
   }
 
-  fun setAllowedCountries(countries: List<String>) {
-    allowedCountries = countries.toSet()
+  fun setAllowedCountries(countries: List<String>?) {
+    allowedCountries = countries?.toSet() ?: emptySet()
   }
 
-  fun setAutocompleteCountries(countries: List<String>) {
-    autocompleteCountries = countries.toSet()
+  fun setAutocompleteCountries(countries: List<String>?) {
+    autocompleteCountries = countries?.toSet() ?: emptySet()
   }
 
-  fun setPrimaryButtonTitle(title: String) {
+  fun setPrimaryButtonTitle(title: String?) {
     buttonTitle = title
   }
 
-  fun setSheetTitle(title: String) {
+  fun setSheetTitle(title: String?) {
     sheetTitle = title
   }
 
-  fun setGooglePlacesApiKey(key: String) {
+  fun setGooglePlacesApiKey(key: String?) {
     googlePlacesApiKey = key
   }
 
@@ -158,21 +158,27 @@ class AddressSheetView(
       )
     }
 
-    internal fun buildResult(addressDetails: AddressDetails): WritableMap {
-      val result = WritableNativeMap()
-      result.putString("name", addressDetails.name)
-      WritableNativeMap().let {
-        it.putString("city", addressDetails.address?.city)
-        it.putString("country", addressDetails.address?.country)
-        it.putString("line1", addressDetails.address?.line1)
-        it.putString("line2", addressDetails.address?.line2)
-        it.putString("postalCode", addressDetails.address?.postalCode)
-        it.putString("state", addressDetails.address?.state)
-        result.putMap("address", it)
+    internal fun buildResult(addressDetails: AddressDetails): WritableMap =
+      WritableNativeMap().apply {
+        putMap(
+          "result",
+          WritableNativeMap().apply {
+            putString("name", addressDetails.name)
+            putMap(
+              "address",
+              WritableNativeMap().apply {
+                putString("city", addressDetails.address?.city)
+                putString("country", addressDetails.address?.country)
+                putString("line1", addressDetails.address?.line1)
+                putString("line2", addressDetails.address?.line2)
+                putString("postalCode", addressDetails.address?.postalCode)
+                putString("state", addressDetails.address?.state)
+              },
+            )
+            putString("phone", addressDetails.phoneNumber)
+            putBoolean("isCheckboxSelected", addressDetails.isCheckboxSelected ?: false)
+          },
+        )
       }
-      result.putString("phone", addressDetails.phoneNumber)
-      result.putBoolean("isCheckboxSelected", addressDetails.isCheckboxSelected ?: false)
-      return result
-    }
   }
 }