@capacitor-community/stripe-terminal 6.0.2 → 6.1.0

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

@@ -26,6 +26,7 @@ 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.BatteryStatus;
 import com.stripe.stripeterminal.external.models.CardPresentDetails;
 import com.stripe.stripeterminal.external.models.CollectConfiguration;
 import com.stripe.stripeterminal.external.models.ConnectionConfiguration.BluetoothConnectionConfiguration;
@@ -33,12 +34,20 @@ import com.stripe.stripeterminal.external.models.ConnectionConfiguration.Interne
 import com.stripe.stripeterminal.external.models.ConnectionConfiguration.LocalMobileConnectionConfiguration;
 import com.stripe.stripeterminal.external.models.ConnectionConfiguration.UsbConnectionConfiguration;
 import com.stripe.stripeterminal.external.models.ConnectionStatus;
+import com.stripe.stripeterminal.external.models.DisconnectReason;
 import com.stripe.stripeterminal.external.models.DiscoveryConfiguration;
 import com.stripe.stripeterminal.external.models.PaymentIntent;
 import com.stripe.stripeterminal.external.models.PaymentMethod;
 import com.stripe.stripeterminal.external.models.PaymentStatus;
 import com.stripe.stripeterminal.external.models.Reader;
+import com.stripe.stripeterminal.external.models.ReaderDisplayMessage;
+import com.stripe.stripeterminal.external.models.ReaderEvent;
+import com.stripe.stripeterminal.external.models.ReaderInputOptions;
 import com.stripe.stripeterminal.external.models.ReaderSoftwareUpdate;
+import com.stripe.stripeterminal.external.models.SimulateReaderUpdate;
+import com.stripe.stripeterminal.external.models.SimulatedCard;
+import com.stripe.stripeterminal.external.models.SimulatedCardType;
+import com.stripe.stripeterminal.external.models.SimulatorConfiguration;
 import com.stripe.stripeterminal.external.models.TerminalException;
 import com.stripe.stripeterminal.log.LogLevel;
 import java.util.ArrayList;
@@ -95,17 +104,23 @@ public class StripeTerminal extends Executor {
         TerminalListener listener = new TerminalListener() {
             @Override
             public void onUnexpectedReaderDisconnect(@NonNull Reader reader) {
-                // TODO: Listenerを追加
+                notifyListeners(
+                    TerminalEnumEvent.UnexpectedReaderDisconnect.getWebEventName(),
+                    new JSObject().put("reader", convertReaderInterface(reader))
+                );
             }
 
             @Override
             public void onConnectionStatusChange(@NonNull ConnectionStatus status) {
-                // TODO: Listenerを追加
+                notifyListeners(
+                    TerminalEnumEvent.ConnectionStatusChange.getWebEventName(),
+                    new JSObject().put("status", status.toString())
+                );
             }
 
             @Override
             public void onPaymentStatusChange(@NonNull PaymentStatus status) {
-                // TODO: Listenerを追加
+                notifyListeners(TerminalEnumEvent.PaymentStatusChange.getWebEventName(), new JSObject().put("status", status.toString()));
             }
         };
         LogLevel logLevel = LogLevel.VERBOSE;
@@ -121,6 +136,24 @@ public class StripeTerminal extends Executor {
         this.tokenProvider.setConnectionToken(call);
     }
 
+    public void setSimulatorConfiguration(PluginCall call) {
+        try {
+            Terminal
+                .getInstance()
+                .setSimulatorConfiguration(
+                    new SimulatorConfiguration(
+                        SimulateReaderUpdate.valueOf(call.getString("update", "UPDATE_AVAILABLE")),
+                        new SimulatedCard(SimulatedCardType.valueOf(call.getString("simulatedCard", "VISA"))),
+                        call.getLong("simulatedTipAmount", null)
+                    )
+                );
+
+            call.resolve();
+        } catch (Exception ex) {
+            call.reject(ex.getMessage());
+        }
+    }
+
     public void onDiscoverReaders(final PluginCall call) {
         if (
             ActivityCompat.checkSelfPermission(this.contextSupplier.get(), Manifest.permission.ACCESS_FINE_LOCATION) !=
@@ -161,7 +194,7 @@ public class StripeTerminal extends Executor {
 
             int i = 0;
             for (Reader reader : this.readers) {
-                readersJSObject.put(new JSObject().put("index", String.valueOf(i)).put("serialNumber", reader.getSerialNumber()));
+                readersJSObject.put(convertReaderInterface(reader).put("index", String.valueOf(i)));
             }
             this.notifyListeners(TerminalEnumEvent.DiscoveredReaders.getWebEventName(), new JSObject().put("readers", readersJSObject));
             call.resolve(new JSObject().put("readers", readersJSObject));
@@ -205,7 +238,7 @@ public class StripeTerminal extends Executor {
         if (reader == null) {
             call.resolve(new JSObject().put("reader", JSObject.NULL));
         } else {
-            call.resolve(new JSObject().put("reader", new JSObject().put("serialNumber", reader.getSerialNumber())));
+            call.resolve(new JSObject().put("reader", convertReaderInterface(reader)));
         }
     }
 
@@ -338,7 +371,7 @@ public class StripeTerminal extends Executor {
 
                     @Override
                     public void onFailure(@NonNull TerminalException e) {
-                        call.reject(e.getErrorMessage());
+                        call.reject(e.getLocalizedMessage());
                     }
                 }
             );
@@ -443,16 +476,39 @@ public class StripeTerminal extends Executor {
             @Override
             public void onStartInstallingUpdate(@NotNull ReaderSoftwareUpdate update, @NotNull Cancelable cancelable) {
                 // Show UI communicating that a required update has started installing
+                notifyListeners(
+                    TerminalEnumEvent.StartInstallingUpdate.getWebEventName(),
+                    new JSObject().put("update", convertReaderSoftwareUpdate(update))
+                );
             }
 
             @Override
             public void onReportReaderSoftwareUpdateProgress(float progress) {
                 // Update the progress of the install
+                notifyListeners(TerminalEnumEvent.ReaderSoftwareUpdateProgress.getWebEventName(), new JSObject().put("progress", progress));
             }
 
             @Override
-            public void onFinishInstallingUpdate(@Nullable ReaderSoftwareUpdate update, @Nullable TerminalException e) {
-                // Report success or failure of the update
+            public void onFinishInstallingUpdate(@Nullable ReaderSoftwareUpdate update, @Nullable TerminalException error) {
+                JSObject eventObject = new JSObject();
+
+                if (error != null) {
+                    // note: Since errorCode cannot be obtained in iOS, use errorMessage for unification.
+                    eventObject.put("error", error.getLocalizedMessage());
+                    notifyListeners(TerminalEnumEvent.FinishInstallingUpdate.getWebEventName(), eventObject);
+                    return;
+                }
+
+                eventObject.put("update", update == null ? null : convertReaderSoftwareUpdate(update));
+                notifyListeners(TerminalEnumEvent.FinishInstallingUpdate.getWebEventName(), eventObject);
+            }
+
+            @Override
+            public void onBatteryLevelUpdate(float batteryLevel, @NonNull BatteryStatus batteryStatus, boolean isCharging) {
+                notifyListeners(
+                    TerminalEnumEvent.BatteryLevel.getWebEventName(),
+                    new JSObject().put("level", batteryLevel).put("charging", isCharging).put("status", batteryStatus.toString())
+                );
             }
 
             @Override
@@ -462,7 +518,54 @@ public class StripeTerminal extends Executor {
             public void onReportAvailableUpdate(@NotNull ReaderSoftwareUpdate update) {
                 // An update is available for the connected reader. Show this update in your application.
                 // This update can be installed using `Terminal.getInstance().installAvailableUpdate`.
+                notifyListeners(
+                    TerminalEnumEvent.ReportAvailableUpdate.getWebEventName(),
+                    new JSObject().put("update", convertReaderSoftwareUpdate(update))
+                );
+            }
+
+            @Override
+            public void onReportReaderEvent(@NotNull ReaderEvent event) {
+                notifyListeners(TerminalEnumEvent.ReaderEvent.getWebEventName(), new JSObject().put("event", event.toString()));
+            }
+
+            @Override
+            public void onRequestReaderDisplayMessage(@NotNull ReaderDisplayMessage message) {
+                notifyListeners(
+                    TerminalEnumEvent.RequestDisplayMessage.getWebEventName(),
+                    new JSObject().put("messageType", message.name()).put("message", message.toString())
+                );
+            }
+
+            @Override
+            public void onRequestReaderInput(@NotNull ReaderInputOptions options) {
+                List<ReaderInputOptions.ReaderInputOption> optionsList = options.getOptions();
+                JSArray jsOptions = new JSArray();
+                for (ReaderInputOptions.ReaderInputOption optionType : optionsList) {
+                    jsOptions.put(optionType.name());
+                }
+
+                notifyListeners(
+                    TerminalEnumEvent.RequestReaderInput.getWebEventName(),
+                    new JSObject().put("options", jsOptions).put("message", options.toString())
+                );
+            }
+
+            public void onDisconnect(@NotNull DisconnectReason reason) {
+                notifyListeners(TerminalEnumEvent.DisconnectedReader.getWebEventName(), new JSObject().put("reason", reason.toString()));
             }
         };
     }
+
+    private JSObject convertReaderInterface(Reader reader) {
+        return new JSObject().put("serialNumber", reader.getSerialNumber());
+    }
+
+    private JSObject convertReaderSoftwareUpdate(ReaderSoftwareUpdate update) {
+        return new JSObject()
+            .put("version", update.getVersion())
+            .put("settingsVersion", update.getSettingsVersion())
+            .put("requiredAt", update.getRequiredAt().getTime())
+            .put("timeEstimate", update.getTimeEstimate().toString());
+    }
 }

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

@@ -3,7 +3,6 @@ package com.getcapacitor.community.stripe.terminal;
 import android.Manifest;
 import android.os.Build;
 import android.util.Log;
-
 import androidx.annotation.RequiresApi;
 import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
@@ -13,7 +12,6 @@ import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
 import com.stripe.stripeterminal.external.models.TerminalException;
-
 import java.util.Objects;
 
 @RequiresApi(api = Build.VERSION_CODES.S)
@@ -47,6 +45,11 @@ public class StripeTerminalPlugin extends Plugin {
         this.implementation.setConnectionToken(call);
     }
 
+    @PluginMethod
+    public void setSimulatorConfiguration(PluginCall call) {
+        this.implementation.setSimulatorConfiguration(call);
+    }
+
     @PermissionCallback
     private void locationPermsCallback(PluginCall call) throws TerminalException {
         if (getPermissionState("location") == PermissionState.GRANTED) {
@@ -59,7 +62,11 @@ public class StripeTerminalPlugin extends Plugin {
     @PermissionCallback
     private void bluetoothOldPermsCallback(PluginCall call) throws TerminalException {
         if (getPermissionState("bluetooth_old") == PermissionState.GRANTED) {
-            this.connectReader(call);
+            if (Objects.equals(call.getMethodName(), "discoverReaders")) {
+                this.discoverReaders(call);
+            } else {
+                this.connectReader(call);
+            }
         } else {
             requestPermissionForAlias("bluetooth_old", call, "bluetoothOldPermsCallback");
         }
@@ -68,7 +75,11 @@ public class StripeTerminalPlugin extends Plugin {
     @PermissionCallback
     private void bluetoothPermsCallback(PluginCall call) throws TerminalException {
         if (getPermissionState("bluetooth") == PermissionState.GRANTED) {
-            this.connectReader(call);
+            if (Objects.equals(call.getMethodName(), "discoverReaders")) {
+                this.discoverReaders(call);
+            } else {
+                this.connectReader(call);
+            }
         } else {
             requestPermissionForAlias("bluetooth", call, "bluetoothPermsCallback");
         }
@@ -85,7 +96,22 @@ public class StripeTerminalPlugin extends Plugin {
 
     @PluginMethod
     public void discoverReaders(PluginCall call) {
-        this.implementation.onDiscoverReaders(call);
+        if (
+            Objects.equals(call.getString("type"), TerminalConnectTypes.Bluetooth.getWebEventName()) ||
+            Objects.equals(call.getString("type"), TerminalConnectTypes.Simulated.getWebEventName())
+        ) {
+            Log.d("Capacitor:permission bluetooth_old", getPermissionState("bluetooth_old").toString());
+            Log.d("Capacitor:permission bluetooth", getPermissionState("bluetooth").toString());
+            if (Build.VERSION.SDK_INT <= 30 && getPermissionState("bluetooth_old") != PermissionState.GRANTED) {
+                requestPermissionForAlias("bluetooth_old", call, "bluetoothOldPermsCallback");
+            } else if (Build.VERSION.SDK_INT > 30 && getPermissionState("bluetooth") != PermissionState.GRANTED) {
+                requestPermissionForAlias("bluetooth", call, "bluetoothPermsCallback");
+            } else {
+                this.implementation.onDiscoverReaders(call);
+            }
+        } else {
+            this.implementation.onDiscoverReaders(call);
+        }
     }
 
     @PluginMethod

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

@@ -6,9 +6,20 @@ enum class TerminalEnumEvent(val webEventName: String) {
     CancelDiscoveredReaders("terminalCancelDiscoveredReaders"),
     ConnectedReader("terminalConnectedReader"),
     DisconnectedReader("terminalDisconnectedReader"),
+    ConnectionStatusChange("terminalConnectionStatusChange"),
+    UnexpectedReaderDisconnect("terminalUnexpectedReaderDisconnect"),
     ConfirmedPaymentIntent("terminalConfirmedPaymentIntent"),
     CollectedPaymentIntent("terminalCollectedPaymentIntent"),
     Canceled("terminalCanceled"),
     Failed("terminalFailed"),
     RequestedConnectionToken("terminalRequestedConnectionToken"),
+    ReportAvailableUpdate("terminalReportAvailableUpdate"),
+    StartInstallingUpdate("terminalStartInstallingUpdate"),
+    ReaderSoftwareUpdateProgress("terminalReaderSoftwareUpdateProgress"),
+    FinishInstallingUpdate("terminalFinishInstallingUpdate"),
+    BatteryLevel("terminalBatteryLevel"),
+    ReaderEvent("terminalReaderEvent"),
+    RequestDisplayMessage("terminalRequestDisplayMessage"),
+    RequestReaderInput("terminalRequestReaderInput"),
+    PaymentStatusChange("terminalPaymentStatusChange"),
 }