@capacitor-community/stripe-terminal 6.0.0-1 → 6.0.0

package/CapacitorCommunityStripeTerminal.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
-  s.dependency 'StripeTerminal', '~> 2.17.1'
+  s.dependency 'StripeTerminal', '~> 3.4.0'
   s.swift_version = '5.1'
 end

package/README.md

@@ -5,8 +5,8 @@ We have confirmed that it works well in the demo project. Please refer to https:
 
 - [x] Tap To Pay
 - [x] Internet
-- [ ] Bluetooth
-- [ ] USB
+- [x] Bluetooth
+- [x] USB
 
 ## Install
 
@@ -27,8 +27,9 @@ Add permissions to your `android/app/src/main/AndroidManifest.xml` file:
 + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 + <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
 + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
-+ <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 + <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
++ <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
++ <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 ```
 
 If used in conjunction with the `@capacitor-community/stripe` plugin, the following settings may be necessary
@@ -50,12 +51,14 @@ And update minSdkVersion to 26 And compileSdkVersion to 34 in your `android/app/
   ext {
 -    minSdkVersion = 22
 -    compileSdkVersion = 33
-+    minSdkVersion = 26
++    minSdkVersion = 30
 +    compileSdkVersion = 34
 ```
 
 ## Usage
 
+### use native http client for getting a token
+
 ```typescript
 (async ()=> {
   /**
@@ -69,26 +72,63 @@ And update minSdkVersion to 26 And compileSdkVersion to 34 in your `android/app/
   await StripeTerminal.connectReader({
     reader: readers[0],
   });
-  await StripeTerminal.collect({ paymentIntent: "**************" });
+  // Collect payment intent
+  await StripeTerminal.collectPaymentMethod({ paymentIntent: "**************" });
+  // Process and confirm payment intent
+  await StripeTerminal.confirmPaymentIntent();
+  // disconnect reader
+  await StripeTerminal.disconnectReader();
 });
 ```
 
+### set string token
+
+```typescript
+(async ()=> {
+  // run before StripeTerminal.initialize
+  StripeTerminal.addListener(TerminalEventsEnum.RequestedConnectionToken, async () => {
+    const { token } = (await fetch("https://example.com/token")).json();
+    StripeTerminal.setConnectionToken({ token });
+  });
+});
+(async ()=> {
+  await StripeTerminal.initialize({ isTest: true })
+  const { readers } = await StripeTerminal.discoverReaders({
+    type: TerminalConnectTypes.TapToPay,
+    locationId: "**************",
+  });
+  await StripeTerminal.connectReader({
+    reader: readers[0],
+  });
+  // Collect payment intent
+  await StripeTerminal.collectPaymentMethod({ paymentIntent: "**************" });
+  // Process and confirm payment intent
+  await StripeTerminal.confirmPaymentIntent();
+  // disconnect reader
+  await StripeTerminal.disconnectReader();
+});
+````
+
 ## API
 
 <docgen-index>
 
 * [`initialize(...)`](#initialize)
 * [`discoverReaders(...)`](#discoverreaders)
+* [`setConnectionToken(...)`](#setconnectiontoken)
 * [`connectReader(...)`](#connectreader)
 * [`getConnectedReader()`](#getconnectedreader)
 * [`disconnectReader()`](#disconnectreader)
 * [`cancelDiscoverReaders()`](#canceldiscoverreaders)
-* [`collect(...)`](#collect)
-* [`cancelCollect()`](#cancelcollect)
+* [`collectPaymentMethod(...)`](#collectpaymentmethod)
+* [`cancelCollectPaymentMethod()`](#cancelcollectpaymentmethod)
+* [`confirmPaymentIntent()`](#confirmpaymentintent)
 * [`addListener(TerminalEventsEnum.Loaded, ...)`](#addlistenerterminaleventsenumloaded)
+* [`addListener(TerminalEventsEnum.RequestedConnectionToken, ...)`](#addlistenerterminaleventsenumrequestedconnectiontoken)
 * [`addListener(TerminalEventsEnum.DiscoveredReaders, ...)`](#addlistenerterminaleventsenumdiscoveredreaders)
 * [`addListener(TerminalEventsEnum.ConnectedReader, ...)`](#addlistenerterminaleventsenumconnectedreader)
-* [`addListener(TerminalEventsEnum.Completed, ...)`](#addlistenerterminaleventsenumcompleted)
+* [`addListener(TerminalEventsEnum.ConfirmedPaymentIntent, ...)`](#addlistenerterminaleventsenumconfirmedpaymentintent)
+* [`addListener(TerminalEventsEnum.CollectedPaymentIntent, ...)`](#addlistenerterminaleventsenumcollectedpaymentintent)
 * [`addListener(TerminalEventsEnum.Canceled, ...)`](#addlistenerterminaleventsenumcanceled)
 * [`addListener(TerminalEventsEnum.Failed, ...)`](#addlistenerterminaleventsenumfailed)
 * [Interfaces](#interfaces)
@@ -103,12 +143,12 @@ And update minSdkVersion to 26 And compileSdkVersion to 34 in your `android/app/
 ### initialize(...)
 
 ```typescript
-initialize(options: { tokenProviderEndpoint: string; isTest: boolean; }) => Promise<void>
+initialize(options: { tokenProviderEndpoint?: string; isTest: boolean; }) => Promise<void>
 ```
 
-| Param         | Type                                                             |
-| ------------- | ---------------------------------------------------------------- |
-| **`options`** | <code>{ tokenProviderEndpoint: string; isTest: boolean; }</code> |
+| Param         | Type                                                              |
+| ------------- | ----------------------------------------------------------------- |
+| **`options`** | <code>{ tokenProviderEndpoint?: string; isTest: boolean; }</code> |
 
 --------------------
 
@@ -128,6 +168,19 @@ discoverReaders(options: { type: TerminalConnectTypes; locationId?: string; }) =
 --------------------
 
 
+### setConnectionToken(...)
+
+```typescript
+setConnectionToken(options: { token: string; }) => Promise<void>
+```
+
+| Param         | Type                            |
+| ------------- | ------------------------------- |
+| **`options`** | <code>{ token: string; }</code> |
+
+--------------------
+
+
 ### connectReader(...)
 
 ```typescript
@@ -170,10 +223,10 @@ cancelDiscoverReaders() => Promise<void>
 --------------------
 
 
-### collect(...)
+### collectPaymentMethod(...)
 
 ```typescript
-collect(options: { paymentIntent: string; }) => Promise<void>
+collectPaymentMethod(options: { paymentIntent: string; }) => Promise<void>
 ```
 
 | Param         | Type                                    |
@@ -183,10 +236,19 @@ collect(options: { paymentIntent: string; }) => Promise<void>
 --------------------
 
 
-### cancelCollect()
+### cancelCollectPaymentMethod()
 
 ```typescript
-cancelCollect() => Promise<void>
+cancelCollectPaymentMethod() => Promise<void>
+```
+
+--------------------
+
+
+### confirmPaymentIntent()
+
+```typescript
+confirmPaymentIntent() => Promise<void>
 ```
 
 --------------------
@@ -208,6 +270,22 @@ addListener(eventName: TerminalEventsEnum.Loaded, listenerFunc: () => void) => P
 --------------------
 
 
+### addListener(TerminalEventsEnum.RequestedConnectionToken, ...)
+
+```typescript
+addListener(eventName: TerminalEventsEnum.RequestedConnectionToken, listenerFunc: () => void) => Promise<PluginListenerHandle>
+```
+
+| Param              | Type                                                                                       |
+| ------------------ | ------------------------------------------------------------------------------------------ |
+| **`eventName`**    | <code><a href="#terminaleventsenum">TerminalEventsEnum.RequestedConnectionToken</a></code> |
+| **`listenerFunc`** | <code>() =&gt; void</code>                                                                 |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
+
+--------------------
+
+
 ### addListener(TerminalEventsEnum.DiscoveredReaders, ...)
 
 ```typescript
@@ -240,16 +318,32 @@ addListener(eventName: TerminalEventsEnum.ConnectedReader, listenerFunc: () => v
 --------------------
 
 
-### addListener(TerminalEventsEnum.Completed, ...)
+### addListener(TerminalEventsEnum.ConfirmedPaymentIntent, ...)
+
+```typescript
+addListener(eventName: TerminalEventsEnum.ConfirmedPaymentIntent, listenerFunc: () => void) => Promise<PluginListenerHandle>
+```
+
+| Param              | Type                                                                                     |
+| ------------------ | ---------------------------------------------------------------------------------------- |
+| **`eventName`**    | <code><a href="#terminaleventsenum">TerminalEventsEnum.ConfirmedPaymentIntent</a></code> |
+| **`listenerFunc`** | <code>() =&gt; void</code>                                                               |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
+
+--------------------
+
+
+### addListener(TerminalEventsEnum.CollectedPaymentIntent, ...)
 
 ```typescript
-addListener(eventName: TerminalEventsEnum.Completed, listenerFunc: () => void) => Promise<PluginListenerHandle>
+addListener(eventName: TerminalEventsEnum.CollectedPaymentIntent, listenerFunc: () => void) => Promise<PluginListenerHandle>
 ```
 
-| Param              | Type                                                                        |
-| ------------------ | --------------------------------------------------------------------------- |
-| **`eventName`**    | <code><a href="#terminaleventsenum">TerminalEventsEnum.Completed</a></code> |
-| **`listenerFunc`** | <code>() =&gt; void</code>                                                  |
+| Param              | Type                                                                                     |
+| ------------------ | ---------------------------------------------------------------------------------------- |
+| **`eventName`**    | <code><a href="#terminaleventsenum">TerminalEventsEnum.CollectedPaymentIntent</a></code> |
+| **`listenerFunc`** | <code>() =&gt; void</code>                                                               |
 
 **Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
 
@@ -322,15 +416,17 @@ addListener(eventName: TerminalEventsEnum.Failed, listenerFunc: () => void) => P
 
 #### TerminalEventsEnum
 
-| Members                       | Value                                          |
-| ----------------------------- | ---------------------------------------------- |
-| **`Loaded`**                  | <code>'terminalLoaded'</code>                  |
-| **`DiscoveredReaders`**       | <code>'terminalDiscoveredReaders'</code>       |
-| **`CancelDiscoveredReaders`** | <code>'terminalCancelDiscoveredReaders'</code> |
-| **`ConnectedReader`**         | <code>'terminalConnectedReader'</code>         |
-| **`DisconnectedReader`**      | <code>'terminalDisconnectedReader'</code>      |
-| **`Completed`**               | <code>'terminalCompleted'</code>               |
-| **`Canceled`**                | <code>'terminalCanceled'</code>                |
-| **`Failed`**                  | <code>'terminalFailed'</code>                  |
+| Members                        | Value                                           |
+| ------------------------------ | ----------------------------------------------- |
+| **`Loaded`**                   | <code>'terminalLoaded'</code>                   |
+| **`DiscoveredReaders`**        | <code>'terminalDiscoveredReaders'</code>        |
+| **`CancelDiscoveredReaders`**  | <code>'terminalCancelDiscoveredReaders'</code>  |
+| **`ConnectedReader`**          | <code>'terminalConnectedReader'</code>          |
+| **`DisconnectedReader`**       | <code>'terminalDisconnectedReader'</code>       |
+| **`ConfirmedPaymentIntent`**   | <code>'terminalConfirmedPaymentIntent'</code>   |
+| **`CollectedPaymentIntent`**   | <code>'terminalCollectedPaymentIntent'</code>   |
+| **`Canceled`**                 | <code>'terminalCanceled'</code>                 |
+| **`Failed`**                   | <code>'terminalFailed'</code>                   |
+| **`RequestedConnectionToken`** | <code>'terminalRequestedConnectionToken'</code> |
 
 </docgen-api>

package/android/build.gradle

@@ -7,11 +7,11 @@ ext {
     playServicesWalletVersion = project.hasProperty('playServicesWalletVersion') ? rootProject.ext.playServicesWalletVersion : '19.2.+'
     volleyVersion = project.hasProperty('volleyVersion') ? rootProject.ext.volleyVersion : '1.2.1'
     stripeterminalLocalmobileVersion = project.hasProperty('stripeterminalLocalmobileVersion') ? rootProject.ext.stripeterminalLocalmobileVersion : '3.0.+'
-    stripeterminalCoreVersion = project.hasProperty('stripeterminalCoreVersion') ? rootProject.ext.stripeterminalCoreVersion : '3.1.+'
+    stripeterminalCoreVersion = project.hasProperty('stripeterminalCoreVersion') ? rootProject.ext.stripeterminalCoreVersion : '3.4.+'
 }
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.10'
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.8.20'
     repositories {
         google()
         mavenCentral()
@@ -27,7 +27,7 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace "com.getcapacitor.community.stripe.terminal"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
         targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34

package/android/src/main/java/com/getcapacitor/community/stripe/terminal/StripeTerminal.java

@@ -7,12 +7,10 @@ import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.util.Supplier;
-
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
@@ -26,6 +24,7 @@ import com.stripe.stripeterminal.external.callable.DiscoveryListener;
 import com.stripe.stripeterminal.external.callable.PaymentIntentCallback;
 import com.stripe.stripeterminal.external.callable.ReaderCallback;
 import com.stripe.stripeterminal.external.callable.ReaderListener;
+import com.stripe.stripeterminal.external.callable.ReaderReconnectionListener;
 import com.stripe.stripeterminal.external.callable.TerminalListener;
 import com.stripe.stripeterminal.external.models.CardPresentDetails;
 import com.stripe.stripeterminal.external.models.CollectConfiguration;
@@ -42,29 +41,30 @@ import com.stripe.stripeterminal.external.models.Reader;
 import com.stripe.stripeterminal.external.models.ReaderSoftwareUpdate;
 import com.stripe.stripeterminal.external.models.TerminalException;
 import com.stripe.stripeterminal.log.LogLevel;
-
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import org.jetbrains.annotations.NotNull;
 
 public class StripeTerminal extends Executor {
 
+    private TokenProvider tokenProvider;
     private Cancelable discoveryCancelable;
     private Cancelable collectCancelable;
     private List<Reader> readers;
     private String locationId;
     private PluginCall collectCall;
+    private PluginCall confirmPaymentIntentCall;
     private final JSObject emptyObject = new JSObject();
     private Boolean isTest;
     private TerminalConnectTypes terminalConnectType;
+    private PaymentIntent paymentIntentInstance;
 
     public StripeTerminal(
-            Supplier<Context> contextSupplier,
-            Supplier<Activity> activitySupplier,
-            BiConsumer<String, JSObject> notifyListenersFunction,
-            String pluginLogTag
+        Supplier<Context> contextSupplier,
+        Supplier<Activity> activitySupplier,
+        BiConsumer<String, JSObject> notifyListenersFunction,
+        String pluginLogTag
     ) {
         super(contextSupplier, activitySupplier, notifyListenersFunction, pluginLogTag, "StripeTerminalExecutor");
         this.contextSupplier = contextSupplier;
@@ -77,21 +77,21 @@ public class StripeTerminal extends Executor {
         BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter();
         if (!bluetooth.isEnabled()) {
             if (
-                    ActivityCompat.checkSelfPermission(this.contextSupplier.get(), Manifest.permission.BLUETOOTH_CONNECT) ==
-                            PackageManager.PERMISSION_GRANTED
+                ActivityCompat.checkSelfPermission(this.contextSupplier.get(), Manifest.permission.BLUETOOTH_CONNECT) ==
+                PackageManager.PERMISSION_GRANTED
             ) {
                 bluetooth.enable();
             }
         }
 
         this.activitySupplier.get()
-                .runOnUiThread(
-                        () -> {
-                            TerminalApplicationDelegate.onCreate((Application) this.contextSupplier.get().getApplicationContext());
-                            notifyListeners(TerminalEnumEvent.Loaded.getWebEventName(), emptyObject);
-                            call.resolve();
-                        }
-                );
+            .runOnUiThread(
+                () -> {
+                    TerminalApplicationDelegate.onCreate((Application) this.contextSupplier.get().getApplicationContext());
+                    notifyListeners(TerminalEnumEvent.Loaded.getWebEventName(), emptyObject);
+                    call.resolve();
+                }
+            );
         TerminalListener listener = new TerminalListener() {
             @Override
             public void onUnexpectedReaderDisconnect(@NonNull Reader reader) {
@@ -100,24 +100,32 @@ public class StripeTerminal extends Executor {
 
             @Override
             public void onConnectionStatusChange(@NonNull ConnectionStatus status) {
-                 // TODO: Listenerを追加
+                // TODO: Listenerを追加
             }
 
             @Override
             public void onPaymentStatusChange(@NonNull PaymentStatus status) {
-                  // TODO: Listenerを追加
+                // TODO: Listenerを追加
             }
         };
         LogLevel logLevel = LogLevel.VERBOSE;
-        TokenProvider tokenProvider = new TokenProvider(this.contextSupplier, call.getString("tokenProviderEndpoint"));
+        this.tokenProvider =
+            new TokenProvider(this.contextSupplier, call.getString("tokenProviderEndpoint", ""), this.notifyListenersFunction);
         if (!Terminal.isInitialized()) {
-            Terminal.initTerminal(this.contextSupplier.get().getApplicationContext(), logLevel, tokenProvider, listener);
+            Terminal.initTerminal(this.contextSupplier.get().getApplicationContext(), logLevel, this.tokenProvider, listener);
         }
         Terminal.getInstance();
     }
 
-    public void onDiscoverReaders(final PluginCall call)  {
-        if (ActivityCompat.checkSelfPermission(this.contextSupplier.get(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+    public void setConnectionToken(PluginCall call) {
+        this.tokenProvider.setConnectionToken(call);
+    }
+
+    public void onDiscoverReaders(final PluginCall call) {
+        if (
+            ActivityCompat.checkSelfPermission(this.contextSupplier.get(), Manifest.permission.ACCESS_FINE_LOCATION) !=
+            PackageManager.PERMISSION_GRANTED
+        ) {
             Log.d(this.logTag, "android.permission.ACCESS_FINE_LOCATION permission is not granted.");
             call.reject("android.permission.ACCESS_FINE_LOCATION permission is not granted.");
             return;
@@ -134,7 +142,10 @@ public class StripeTerminal extends Executor {
         } else if (Objects.equals(call.getString("type"), TerminalConnectTypes.Usb.getWebEventName())) {
             config = new DiscoveryConfiguration.UsbDiscoveryConfiguration(0, this.isTest);
             this.terminalConnectType = TerminalConnectTypes.Usb;
-        } else if (Objects.equals(call.getString("type"), TerminalConnectTypes.Bluetooth.getWebEventName()) || Objects.equals(call.getString("type"), TerminalConnectTypes.Simulated.getWebEventName())) {
+        } else if (
+            Objects.equals(call.getString("type"), TerminalConnectTypes.Bluetooth.getWebEventName()) ||
+            Objects.equals(call.getString("type"), TerminalConnectTypes.Simulated.getWebEventName())
+        ) {
             config = new DiscoveryConfiguration.BluetoothDiscoveryConfiguration(0, this.isTest);
             this.terminalConnectType = TerminalConnectTypes.Bluetooth;
         } else {
@@ -156,21 +167,23 @@ public class StripeTerminal extends Executor {
             call.resolve(new JSObject().put("readers", readersJSObject));
         };
         discoveryCancelable =
-                Terminal.getInstance()
-                        .discoverReaders(
-                                config,
-                                discoveryListener,
-                                new Callback() {
-                                    @Override
-                                    public void onSuccess() {
-                                        Log.d(logTag, "Finished discovering readers");
-                                    }
-                                    @Override
-                                    public void onFailure(@NonNull TerminalException ex) {
-                                        Log.d(logTag, ex.getLocalizedMessage());
-                                    }
-                                }
-                        );
+            Terminal
+                .getInstance()
+                .discoverReaders(
+                    config,
+                    discoveryListener,
+                    new Callback() {
+                        @Override
+                        public void onSuccess() {
+                            Log.d(logTag, "Finished discovering readers");
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull TerminalException ex) {
+                            Log.d(logTag, ex.getLocalizedMessage());
+                        }
+                    }
+                );
     }
 
     public void connectReader(final PluginCall call) {
@@ -229,53 +242,53 @@ public class StripeTerminal extends Executor {
         }
 
         LocalMobileConnectionConfiguration config = new LocalMobileConnectionConfiguration(
-            this.locationId
+            this.locationId,
+            true,
+            this.localMobileReaderReconnectionListener
         );
-        Terminal
-            .getInstance()
-            .connectLocalMobileReader(
-                this.readers.get(reader.getInteger("index")),
-                config,
-                this.readerCallback(call)
-            );
+        Terminal.getInstance().connectLocalMobileReader(this.readers.get(reader.getInteger("index")), config, this.readerCallback(call));
     }
 
+    ReaderReconnectionListener localMobileReaderReconnectionListener = new ReaderReconnectionListener() {
+        @Override
+        public void onReaderReconnectStarted(@NonNull Reader reader, @NonNull Cancelable cancelReconnect) {
+            // 1. Notified at the start of a reconnection attempt
+            // Use cancelable to stop reconnection at any time
+        }
+
+        @Override
+        public void onReaderReconnectSucceeded(@NonNull Reader reader) {
+            // 2. Notified when reader reconnection succeeds
+            // App is now connected
+        }
+
+        @Override
+        public void onReaderReconnectFailed(@NonNull Reader reader) {
+            // 3. Notified when reader reconnection fails
+            // App is now disconnected
+        }
+    };
+
     private void connectInternetReader(final PluginCall call) {
         JSObject reader = call.getObject("reader");
         InternetConnectionConfiguration config = new InternetConnectionConfiguration();
-        Terminal
-            .getInstance()
-            .connectInternetReader(
-                this.readers.get(reader.getInteger("index")),
-                config,
-                this.readerCallback(call)
-            );
+        Terminal.getInstance().connectInternetReader(this.readers.get(reader.getInteger("index")), config, this.readerCallback(call));
     }
 
     private void connectUsbReader(final PluginCall call) {
         JSObject reader = call.getObject("reader");
         UsbConnectionConfiguration config = new UsbConnectionConfiguration(this.locationId);
         Terminal
-                .getInstance()
-                .connectUsbReader(
-                        this.readers.get(reader.getInteger("index")),
-                        config,
-                        this.readerListener(),
-                        this.readerCallback(call)
-                );
+            .getInstance()
+            .connectUsbReader(this.readers.get(reader.getInteger("index")), config, this.readerListener(), this.readerCallback(call));
     }
 
     private void connectBluetoothReader(final PluginCall call) {
         JSObject reader = call.getObject("reader");
         BluetoothConnectionConfiguration config = new BluetoothConnectionConfiguration(this.locationId);
         Terminal
-                .getInstance()
-                .connectBluetoothReader(
-                        this.readers.get(reader.getInteger("index")),
-                        config,
-                        this.readerListener(),
-                        this.readerCallback(call)
-                );
+            .getInstance()
+            .connectBluetoothReader(this.readers.get(reader.getInteger("index")), config, this.readerListener(), this.readerCallback(call));
     }
 
     public void cancelDiscoverReaders(final PluginCall call) {
@@ -299,7 +312,7 @@ public class StripeTerminal extends Executor {
         }
     }
 
-    public void collect(final PluginCall call) {
+    public void collectPaymentMethod(final PluginCall call) {
         if (call.getString("paymentIntent") == null) {
             call.reject("The value of paymentIntent is not set correctly.");
             return;
@@ -308,7 +321,7 @@ public class StripeTerminal extends Executor {
         Terminal.getInstance().retrievePaymentIntent(call.getString("paymentIntent"), createPaymentIntentCallback);
     }
 
-    public void cancelCollect(final PluginCall call) {
+    public void cancelCollectPaymentMethod(final PluginCall call) {
         if (this.collectCancelable == null || this.collectCancelable.isCompleted()) {
             call.resolve();
             return;
@@ -334,9 +347,7 @@ public class StripeTerminal extends Executor {
     private final PaymentIntentCallback createPaymentIntentCallback = new PaymentIntentCallback() {
         @Override
         public void onSuccess(@NonNull PaymentIntent paymentIntent) {
-            CollectConfiguration collectConfig = new CollectConfiguration.Builder()
-                    .updatePaymentIntent(true)
-                    .build();
+            CollectConfiguration collectConfig = new CollectConfiguration.Builder().updatePaymentIntent(true).build();
             collectCancelable = Terminal.getInstance().collectPaymentMethod(paymentIntent, collectPaymentMethodCallback, collectConfig);
         }
 
@@ -347,20 +358,19 @@ public class StripeTerminal extends Executor {
         }
     };
 
-    // Step 3 - we've collected the payment method, so it's time to process the payment
     private final PaymentIntentCallback collectPaymentMethodCallback = new PaymentIntentCallback() {
         @Override
         public void onSuccess(PaymentIntent paymentIntent) {
             collectCancelable = null;
-            notifyListeners(TerminalEnumEvent.Completed.getWebEventName(), emptyObject);
+            paymentIntentInstance = paymentIntent;
+            notifyListeners(TerminalEnumEvent.CollectedPaymentIntent.getWebEventName(), emptyObject);
 
             PaymentMethod pm = paymentIntent.getPaymentMethod();
-            CardPresentDetails card = pm.getCardPresentDetails() != null
-                    ? pm.getCardPresentDetails()
-                    : pm.getInteracPresentDetails();
+            CardPresentDetails card = pm.getCardPresentDetails() != null ? pm.getCardPresentDetails() : pm.getInteracPresentDetails();
 
             if (card != null) {
-                collectCall.resolve(new JSObject()
+                collectCall.resolve(
+                    new JSObject()
                         .put("brand", card.getBrand())
                         .put("cardholderName", card.getCardholderName())
                         .put("country", card.getCountry())
@@ -373,7 +383,6 @@ public class StripeTerminal extends Executor {
                         .put("last4", card.getLast4())
                         .put("networks", card.getNetworks())
                         .put("readMethod", card.getReadMethod())
-
                 );
             } else {
                 collectCall.resolve();
@@ -388,6 +397,31 @@ public class StripeTerminal extends Executor {
         }
     };
 
+    public void confirmPaymentIntent(final PluginCall call) {
+        if (this.paymentIntentInstance == null) {
+            call.reject("PaymentIntent not found for confirmPaymentIntent. Use collect method first and try again.");
+            return;
+        }
+
+        this.confirmPaymentIntentCall = call;
+        Terminal.getInstance().confirmPaymentIntent(this.paymentIntentInstance, confirmPaymentMethodCallback);
+    }
+
+    private final PaymentIntentCallback confirmPaymentMethodCallback = new PaymentIntentCallback() {
+        @Override
+        public void onSuccess(PaymentIntent paymentIntent) {
+            notifyListeners(TerminalEnumEvent.ConfirmedPaymentIntent.getWebEventName(), emptyObject);
+            paymentIntentInstance = null;
+            confirmPaymentIntentCall.resolve();
+        }
+
+        @Override
+        public void onFailure(TerminalException exception) {
+            notifyListeners(TerminalEnumEvent.Failed.getWebEventName(), emptyObject);
+            confirmPaymentIntentCall.reject(exception.getLocalizedMessage());
+        }
+    };
+
     private ReaderCallback readerCallback(final PluginCall call) {
         return new ReaderCallback() {
             @Override
@@ -422,9 +456,7 @@ public class StripeTerminal extends Executor {
             }
 
             @Override
-            public void onReportLowBatteryWarning() {
-
-            }
+            public void onReportLowBatteryWarning() {}
 
             @Override
             public void onReportAvailableUpdate(@NotNull ReaderSoftwareUpdate update) {