Use sdk_uuid for payment and setup intents

android/src/main/java/com/stripeterminalreactnative/Mappers.kt

@@ -146,17 +146,18 @@ internal fun mapToDiscoveryMethod(method: String?): DiscoveryMethod? {
     }
 }
 
-internal fun mapFromPaymentIntent(paymentIntent: PaymentIntent): ReadableMap = nativeMapOf {
+internal fun mapFromPaymentIntent(paymentIntent: PaymentIntent, uuid: String): ReadableMap = nativeMapOf {
     putInt("amount", paymentIntent.amount.toInt())
     putString("currency", paymentIntent.currency)
     putString("id", paymentIntent.id)
     putString("description", paymentIntent.description)
     putString("status", mapFromPaymentIntentStatus(paymentIntent.status))
     putArray("charges", mapFromChargesList(paymentIntent.getCharges()))
     putString("created", convertToUnixTimestamp(paymentIntent.created))
+    putString("sdk_uuid", uuid)
 }
 
-internal fun mapFromSetupIntent(setupIntent: SetupIntent): ReadableMap = nativeMapOf {
+internal fun mapFromSetupIntent(setupIntent: SetupIntent, uuid: String): ReadableMap = nativeMapOf {
     putString("created", convertToUnixTimestamp(setupIntent.created))
     putString("id", setupIntent.id)
     putString("status", mapFromSetupIntentStatus(setupIntent.status))
@@ -169,6 +170,7 @@ internal fun mapFromSetupIntent(setupIntent: SetupIntent): ReadableMap = nativeM
     putString("onBehalfOfId", setupIntent.onBehalfOfId)
     putString("paymentMethodId", setupIntent.paymentMethodId)
     putString("singleUseMandateId", setupIntent.singleUseMandateId)
+    putString("sdk_uuid", uuid)
 }
 
 internal fun mapFromSetupAttempt(attempt: SetupAttempt?): ReadableMap? = attempt?.let {

android/src/main/java/com/stripeterminalreactnative/StripeTerminalReactNativeModule.kt

@@ -1,5 +1,6 @@
 package com.stripeterminalreactnative
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.content.ComponentCallbacks2
 import android.content.res.Configuration
@@ -51,6 +52,8 @@ import com.stripeterminalreactnative.listener.RNUsbReaderListener
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import java.util.UUID
+import kotlin.collections.HashMap
 
 
 class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
@@ -160,6 +163,7 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
         promise.resolve(null)
     }
 
+    @SuppressLint("MissingPermission")
     @ReactMethod
     @Suppress("unused")
     fun discoverReaders(params: ReadableMap, promise: Promise) = withExceptionResolver(promise) {
@@ -396,8 +400,10 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
             }
         }
 
-        terminal.createPaymentIntent(intentParams.build(), RNPaymentIntentCallback(promise) { pi ->
-            (pi.id ?: pi.offlineDetails?.id)?.let { paymentIntents[it] = pi }
+        val uuid = UUID.randomUUID().toString()
+
+        terminal.createPaymentIntent(intentParams.build(), RNPaymentIntentCallback(promise, uuid) { pi ->
+            paymentIntents[uuid] = pi
         })
     }
 
@@ -406,11 +412,14 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
     @Suppress("unused")
     fun collectPaymentMethod(params: ReadableMap, promise: Promise) =
         withExceptionResolver(promise) {
-            val paymentIntentId = requireParam(params.getString("paymentIntentId")) {
-                "You must provide a paymentIntentId"
+            val paymentIntentJson = requireParam(params.getMap("paymentIntent")) {
+                "You must provide a paymentIntent"
+            }
+            val uuid = requireParam(paymentIntentJson.getString("sdk_uuid")) {
+                "You must provide a sdk_uuid"
             }
-            val paymentIntent = requireParam(paymentIntents[paymentIntentId]) {
-                "There is no associated paymentIntent with id $paymentIntentId"
+            val paymentIntent = requireParam(paymentIntents[uuid]) {
+                "There is no associated paymentIntent with id $uuid"
             }
 
             val configBuilder = CollectConfiguration.Builder()
@@ -432,8 +441,8 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
 
             collectPaymentMethodCancelable = terminal.collectPaymentMethod(
                 paymentIntent,
-                RNPaymentIntentCallback(promise) { pi ->
-                    (pi.id ?: pi.offlineDetails?.id)?.let { paymentIntents[it] = pi }
+                RNPaymentIntentCallback(promise, uuid) { pi ->
+                    paymentIntents[uuid] = pi
                 },
                 config
             )
@@ -443,19 +452,23 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
     @ReactMethod
     @Suppress("unused")
     fun retrievePaymentIntent(clientSecret: String, promise: Promise) {
-        terminal.retrievePaymentIntent(clientSecret, RNPaymentIntentCallback(promise) { pi ->
-            (pi.id ?: pi.offlineDetails?.id)?.let { paymentIntents[it] = pi }
+        val uuid = UUID.randomUUID().toString()
+        terminal.retrievePaymentIntent(clientSecret, RNPaymentIntentCallback(promise, uuid) { pi ->
+            paymentIntents[uuid] = pi
         })
     }
 
     @ReactMethod
     @Suppress("unused")
-    fun confirmPaymentIntent(paymentIntentId: String, promise: Promise) = withExceptionResolver(promise) {
-        val paymentIntent = requireParam(paymentIntents[paymentIntentId]) {
-            "There is no associated paymentIntent with id $paymentIntentId"
+    fun confirmPaymentIntent(paymentIntent: ReadableMap, promise: Promise) = withExceptionResolver(promise) {
+        val uuid = requireParam(paymentIntent.getString("sdk_uuid")) {
+            "You must provide a sdk_uuid"
+        }
+        val paymentIntent = requireParam(paymentIntents[uuid]) {
+            "There is no associated paymentIntent with id $uuid"
         }
 
-        terminal.confirmPaymentIntent(paymentIntent, RNPaymentIntentCallback(promise) {
+        terminal.confirmPaymentIntent(paymentIntent, RNPaymentIntentCallback(promise, uuid) {
             paymentIntents.clear()
         })
     }
@@ -478,29 +491,35 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
             SetupIntentParameters.Builder().setCustomer(customerId).build()
         } ?: SetupIntentParameters.NULL
 
-        terminal.createSetupIntent(intentParams, RNSetupIntentCallback(promise) {
-            setupIntents[it.id] = it
+        val uuid = UUID.randomUUID().toString()
+        terminal.createSetupIntent(intentParams, RNSetupIntentCallback(promise, uuid) {
+            setupIntents[uuid] = it
         })
     }
 
     @ReactMethod
     @Suppress("unused")
     fun retrieveSetupIntent(clientSecret: String, promise: Promise) {
-        terminal.retrieveSetupIntent(clientSecret, RNSetupIntentCallback(promise) {
-            setupIntents[it.id] = it
+        val uuid = UUID.randomUUID().toString()
+        terminal.retrieveSetupIntent(clientSecret, RNSetupIntentCallback(promise, uuid) {
+            setupIntents[uuid] = it
         })
     }
 
     @OptIn(OfflineMode::class)
     @ReactMethod
     @Suppress("unused")
-    fun cancelPaymentIntent(paymentIntentId: String, promise: Promise) =
+    fun cancelPaymentIntent(paymentIntent: ReadableMap, promise: Promise) =
         withExceptionResolver(promise) {
-            val paymentIntent = requireParam(paymentIntents[paymentIntentId]) {
-                "There is no associated paymentIntent with id $paymentIntentId"
+            val uuid = requireParam(paymentIntent.getString("sdk_uuid")) {
+                "You must provide a sdk_uuid"
             }
-            terminal.cancelPaymentIntent(paymentIntent, RNPaymentIntentCallback(promise) { pi ->
-                (pi.id ?: pi.offlineDetails?.id)?.let { paymentIntents[it] = null }
+            val paymentIntent = requireParam(paymentIntents[uuid]) {
+                "There is no associated paymentIntent with id $uuid"
+            }
+
+            terminal.cancelPaymentIntent(paymentIntent, RNPaymentIntentCallback(promise, uuid) {
+                paymentIntents[uuid] = null
             })
         }
 
@@ -514,19 +533,25 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
     @Suppress("unused")
     fun collectSetupIntentPaymentMethod(params: ReadableMap, promise: Promise) =
         withExceptionResolver(promise) {
-            val setupIntentId = params.getString("setupIntentId")
+            val setupIntentJson = requireParam(params.getMap("setupIntent")) {
+                "You must provide a setupIntent"
+            }
+            val uuid = requireParam(setupIntentJson.getString("sdk_uuid")) {
+                "You must provide a sdk_uuid"
+            }
+            val setupIntent = requireParam(setupIntents[uuid]) {
+                "There is no associated setupIntent with id $uuid"
+            }
+
             val customerConsentCollected = getBoolean(params, "customerConsentCollected")
 
-            val setupIntent = requireParam(setupIntents[setupIntentId]) {
-                "There is no created setupIntent with id $setupIntentId"
-            }
             collectSetupIntentCancelable = terminal.collectSetupIntentPaymentMethod(
                 setupIntent,
                 customerConsentCollected,
                 SetupIntentConfiguration.Builder()
                     .setEnableCustomerCancellation(false)
                     .build(),
-                RNSetupIntentCallback(promise) { setupIntents[it.id] = it }
+                RNSetupIntentCallback(promise, uuid) { setupIntents[uuid] = it }
             )
         }
 
@@ -571,28 +596,34 @@ class StripeTerminalReactNativeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     @Suppress("unused")
-    fun cancelSetupIntent(setupIntentId: String, promise: Promise) =
+    fun cancelSetupIntent(setupIntent: ReadableMap, promise: Promise) =
         withExceptionResolver(promise) {
-            val setupIntent = requireParam(setupIntents[setupIntentId]) {
-                "There is no associated setupIntent with id $setupIntentId"
+            val uuid = requireParam(setupIntent.getString("sdk_uuid")) {
+                "You must provide a sdk_uuid"
+            }
+            val setupIntent = requireParam(setupIntents[uuid]) {
+                "There is no associated setupIntent with id $uuid"
             }
 
             val params = SetupIntentCancellationParameters.Builder().build()
 
-            terminal.cancelSetupIntent(setupIntent, params, RNSetupIntentCallback(promise) {
+            terminal.cancelSetupIntent(setupIntent, params, RNSetupIntentCallback(promise, uuid) {
                 setupIntents[setupIntent.id] = null
             })
         }
 
     @ReactMethod
     @Suppress("unused")
-    fun confirmSetupIntent(setupIntentId: String, promise: Promise) =
+    fun confirmSetupIntent(setupIntent: ReadableMap, promise: Promise) =
         withExceptionResolver(promise) {
-            val setupIntent = requireParam(setupIntents[setupIntentId]) {
-                "There is no associated setupIntent with id $setupIntentId"
+            val uuid = requireParam(setupIntent.getString("sdk_uuid")) {
+                "You must provide a sdk_uuid"
+            }
+            val setupIntent = requireParam(setupIntents[uuid]) {
+                "There is no associated setupIntent with id $uuid"
             }
 
-            terminal.confirmSetupIntent(setupIntent, RNSetupIntentCallback(promise) {
+            terminal.confirmSetupIntent(setupIntent, RNSetupIntentCallback(promise, uuid) {
                 setupIntents[it.id] = null
             })
         }

android/src/main/java/com/stripeterminalreactnative/callback/RNPaymentIntentCallback.kt

@@ -10,13 +10,14 @@ import com.stripeterminalreactnative.nativeMapOf
 
 class RNPaymentIntentCallback(
     private val promise: Promise,
+    private val uuid: String,
     private val onPaymentIntentSuccess: (PaymentIntent) -> Unit = {}
     ): PaymentIntentCallback {
 
     override fun onSuccess(paymentIntent: PaymentIntent) {
         onPaymentIntentSuccess(paymentIntent)
         promise.resolve(nativeMapOf {
-            putMap("paymentIntent", mapFromPaymentIntent(paymentIntent))
+            putMap("paymentIntent", mapFromPaymentIntent(paymentIntent, uuid))
         })
     }
 

android/src/main/java/com/stripeterminalreactnative/callback/RNSetupIntentCallback.kt

@@ -10,13 +10,14 @@ import com.stripeterminalreactnative.nativeMapOf
 
 class RNSetupIntentCallback(
     private val promise: Promise,
+    private val uuid: String,
     private val onSetupIntentSuccess: (SetupIntent) -> Unit = {}
     ): SetupIntentCallback {
 
     override fun onSuccess(setupIntent: SetupIntent) {
         onSetupIntentSuccess(setupIntent)
         promise.resolve(nativeMapOf {
-            putMap("setupIntent", mapFromSetupIntent(setupIntent))
+            putMap("setupIntent", mapFromSetupIntent(setupIntent, uuid))
         })
     }
 

bitrise.yml

@@ -97,7 +97,7 @@ workflows:
             - content: |-
                 set -e
                 # This is a terrible hack, as I haven't worked out how Bitrise's `pod install` step interacts with the rbenv set in this app. You definitely shouldn't copy this.
-                cd dev-app/ios && asdf install ruby 2.7.4 && bundle install && \
+                cd dev-app/ios && asdf install ruby 3.2.2 && bundle install && \
                 gem install cocoapods -v 1.12.1 && pod install && cd - && \
                 echo "Checking for diffs in pod lockfile, if this fails please ensure all dependencies are up to date" && \
                 git diff --exit-code

dev-app/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.2.2

dev-app/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.4'
+ruby '3.2.2'
 gem 'cocoapods', '~> 1.11', '>= 1.12.1'
+gem 'activesupport', '~> 7.0', '<= 7.0.8'

dev-app/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.0.7.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -65,7 +65,7 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    minitest (5.19.0)
+    minitest (5.20.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -89,10 +89,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 7.0, <= 7.0.8)
   cocoapods (~> 1.11, >= 1.12.1)
 
 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.1.4

dev-app/src/api/api.ts

@@ -219,7 +219,6 @@ export class Api {
         Authorization: `Bearer ${secretKey}`,
       },
     });
-
     const data = await result.json();
 
     if ('error' in data) {

dev-app/src/screens/CollectCardPaymentScreen.tsx

@@ -254,10 +254,10 @@ export default function CollectCardPaymentScreen() {
       ],
     });
 
-    return await _collectPaymentMethod(paymentIntent.id);
+    return await _collectPaymentMethod(paymentIntent);
   };
 
-  const _collectPaymentMethod = async (paymentIntentId: string) => {
+  const _collectPaymentMethod = async (pi: PaymentIntent.Type) => {
     // @ts-ignore
     setCancel((prev) => ({ ...prev, isDisabled: false }));
     addLogs({
@@ -266,13 +266,13 @@ export default function CollectCardPaymentScreen() {
         {
           name: 'Collect',
           description: 'terminal.collectPaymentMethod',
-          metadata: { paymentIntentId },
+          metadata: { paymentIntentId: pi.id },
           onBack: cancelCollectPaymentMethod,
         },
       ],
     });
     const { paymentIntent, error } = await collectPaymentMethod({
-      paymentIntentId: paymentIntentId,
+      paymentIntent: pi,
       skipTipping: skipTipping,
       tipEligibleAmount: tipEligibleAmount
         ? Number(tipEligibleAmount)
@@ -331,7 +331,7 @@ export default function CollectCardPaymentScreen() {
     });
 
     const { paymentIntent, error } = await confirmPaymentIntent(
-      collectedPaymentIntent.id
+      collectedPaymentIntent
     );
 
     if (error) {