Revert "feat(terminal): sdk version to 5.1.0 (#460)"

This reverts commit 5c34e9c.

Author: rdlabo

demo/angular/ios/App/Podfile.lock

@@ -3,41 +3,41 @@ PODS:
     - CapacitorCordova
   - CapacitorCommunityStripe (8.0.0):
     - Capacitor
-    - StripeApplePay (= 25.3.0)
-    - StripePaymentSheet (= 25.3.0)
+    - StripeApplePay (~> 25.1.0)
+    - StripePaymentSheet (~> 25.1.0)
   - CapacitorCommunityStripeIdentity (8.0.0):
     - Capacitor
-    - StripeIdentity (= 25.3.0)
+    - StripeIdentity (~> 25.1.0)
   - CapacitorCommunityStripeTerminal (8.0.0):
     - Capacitor
-    - StripeTerminal (= 5.1.0)
+    - StripeTerminal (= 4.7.3)
   - CapacitorCordova (8.0.0)
-  - StripeApplePay (25.3.0):
-    - StripeCore (= 25.3.0)
-  - StripeCameraCore (25.3.0):
-    - StripeCore (= 25.3.0)
-  - StripeCore (25.3.0)
-  - StripeIdentity (25.3.0):
-    - StripeCameraCore (= 25.3.0)
-    - StripeCore (= 25.3.0)
-    - StripeUICore (= 25.3.0)
-  - StripePayments (25.3.0):
-    - StripeCore (= 25.3.0)
-    - StripePayments/Stripe3DS2 (= 25.3.0)
-  - StripePayments/Stripe3DS2 (25.3.0):
-    - StripeCore (= 25.3.0)
-  - StripePaymentSheet (25.3.0):
-    - StripeApplePay (= 25.3.0)
-    - StripeCore (= 25.3.0)
-    - StripePayments (= 25.3.0)
-    - StripePaymentsUI (= 25.3.0)
-  - StripePaymentsUI (25.3.0):
-    - StripeCore (= 25.3.0)
-    - StripePayments (= 25.3.0)
-    - StripeUICore (= 25.3.0)
-  - StripeTerminal (5.1.0)
-  - StripeUICore (25.3.0):
-    - StripeCore (= 25.3.0)
+  - StripeApplePay (25.1.1):
+    - StripeCore (= 25.1.1)
+  - StripeCameraCore (25.1.1):
+    - StripeCore (= 25.1.1)
+  - StripeCore (25.1.1)
+  - StripeIdentity (25.1.1):
+    - StripeCameraCore (= 25.1.1)
+    - StripeCore (= 25.1.1)
+    - StripeUICore (= 25.1.1)
+  - StripePayments (25.1.1):
+    - StripeCore (= 25.1.1)
+    - StripePayments/Stripe3DS2 (= 25.1.1)
+  - StripePayments/Stripe3DS2 (25.1.1):
+    - StripeCore (= 25.1.1)
+  - StripePaymentSheet (25.1.1):
+    - StripeApplePay (= 25.1.1)
+    - StripeCore (= 25.1.1)
+    - StripePayments (= 25.1.1)
+    - StripePaymentsUI (= 25.1.1)
+  - StripePaymentsUI (25.1.1):
+    - StripeCore (= 25.1.1)
+    - StripePayments (= 25.1.1)
+    - StripeUICore (= 25.1.1)
+  - StripeTerminal (4.7.3)
+  - StripeUICore (25.1.1):
+    - StripeCore (= 25.1.1)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -72,19 +72,19 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Capacitor: 341ff7cf652ec695d1a8ebf604db448ac7b6d635
-  CapacitorCommunityStripe: 296133e01399e0d3e75da60a5dab4a960bd990a0
-  CapacitorCommunityStripeIdentity: 76cb43dabb928116226505fa7de2b274fad4504f
-  CapacitorCommunityStripeTerminal: 6d6ebbd2d98f84bb43ca99a9dd3ab1d5bccb0afb
+  CapacitorCommunityStripe: 1ceab53ae1225cd985fab575eac6931be9643614
+  CapacitorCommunityStripeIdentity: 520f795fe558bc439d8b39ff9559466f1ff84846
+  CapacitorCommunityStripeTerminal: cebf86072bc1f93d5fbca55818bdc3e39fe5832c
   CapacitorCordova: 5dc3912d25ef770a3fe0f431bb65c9fbfa2e92f9
-  StripeApplePay: c8b3f41e861b8a66c04d8a8f2ccefe600902a645
-  StripeCameraCore: a2570be68b35172fd3a8abde6ebcfa5f76afa213
-  StripeCore: cf1039ef6983d1a2e23cca60bb9a772999581083
-  StripeIdentity: e6c8ad7023536480db57c2c6ad3eb8607c0be4c4
-  StripePayments: 259a5d5804e02f5515368d1763db42bdb4a5224a
-  StripePaymentSheet: ee746e5b8047db07c91ba02bd883ceb228a902d4
-  StripePaymentsUI: 01c922dd7b350d7209e821a8f5507d26c5711318
-  StripeTerminal: 534e102e6389ef3c9857ead60f45b403ddf2bfde
-  StripeUICore: 1dfad61e397dd8fe465f6c458adf4bda2591d8e1
+  StripeApplePay: 4428e5826335017151eeff87e9d36f6688eaa593
+  StripeCameraCore: 3855662b0bb4c01186ee90e1d1c0bbe78e29dce9
+  StripeCore: 76440c9bf61bd84149014414ced3470b8d94eb8e
+  StripeIdentity: f32cd5bdd56eacc7070ac9ea8e93070e7410f358
+  StripePayments: ace6def8949ed33434a5db2f8fdd184388636be5
+  StripePaymentSheet: ec3dadf54b470250a40b3c5f7164641a0f1063c3
+  StripePaymentsUI: 702926af8eae0901821907014ab90c72fc3eabab
+  StripeTerminal: b9e92913da8a08ff5c62af75056ad39bf8b02ac6
+  StripeUICore: c3de64fb6ab7ef376128e862f6bc6817e0a964e9
 
 PODFILE CHECKSUM: 4d7ec376ccecaff558058129ab933ca30f302b19
 

packages/terminal/CapacitorCommunityStripeTerminal.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
-  s.dependency 'StripeTerminal', '5.1.0'
+  s.dependency 'StripeTerminal', '4.7.3'
   s.swift_version = '5.1'
 end

packages/terminal/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
-        .package(url: "https://github.com/stripe/stripe-terminal-ios.git", exact: "5.1.0")
+        .package(url: "https://github.com/stripe/stripe-terminal-ios.git", exact: "4.7.3")
     ],
     targets: [
         .target(

packages/terminal/android/build.gradle

@@ -6,9 +6,9 @@ ext {
 
     playServicesWalletVersion = project.hasProperty('playServicesWalletVersion') ? rootProject.ext.playServicesWalletVersion : '19.2.+'
     volleyVersion = project.hasProperty('volleyVersion') ? rootProject.ext.volleyVersion : '1.2.1'
-    stripeterminalTapToPayVersion = project.hasProperty('stripeterminalTapToPayVersion') ? rootProject.ext.stripeterminalTapToPayVersion : '5.1.+'
-    stripeterminalCoreVersion = project.hasProperty('stripeterminalCoreVersion') ? rootProject.ext.stripeterminalCoreVersion : '5.1.+'
-    stripeterminalAppOnDevicesVersion = project.hasProperty('stripeterminalAppOnDevicesVersion') ? rootProject.ext.stripeterminalAppOnDevicesVersion : '5.1.+'
+    stripeterminalTapToPayVersion = project.hasProperty('stripeterminalTapToPayVersion') ? rootProject.ext.stripeterminalTapToPayVersion : '4.7.+'
+    stripeterminalCoreVersion = project.hasProperty('stripeterminalCoreVersion') ? rootProject.ext.stripeterminalCoreVersion : '4.7.+'
+    stripeterminalHandoffClientVersion = project.hasProperty('stripeterminalHandoffClientVersion') ? rootProject.ext.stripeterminalHandoffClientVersion : '4.7.+'
 }
 
 buildscript {
@@ -72,7 +72,7 @@ dependencies {
 
     implementation "com.stripe:stripeterminal-core:$stripeterminalCoreVersion"
     implementation "com.stripe:stripeterminal-taptopay:$stripeterminalTapToPayVersion"
-    implementation "com.stripe:stripeterminal-appsondevices:$stripeterminalAppOnDevicesVersion"
+    implementation "com.stripe:stripeterminal-handoffclient:$stripeterminalHandoffClientVersion"
     implementation "com.android.volley:volley:$volleyVersion"
     implementation "com.google.android.gms:play-services-wallet:$playServicesWalletVersion"
 }

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

@@ -17,7 +17,7 @@ import com.getcapacitor.community.stripe.terminal.helper.TerminalMappers
 import com.getcapacitor.community.stripe.terminal.models.Executor
 import com.google.android.gms.common.util.BiConsumer
 import com.stripe.stripeterminal.Terminal
-import com.stripe.stripeterminal.Terminal.Companion.init
+import com.stripe.stripeterminal.Terminal.Companion.initTerminal
 import com.stripe.stripeterminal.Terminal.Companion.isInitialized
 import com.stripe.stripeterminal.TerminalApplicationDelegate.onCreate
 import com.stripe.stripeterminal.external.callable.Callback
@@ -29,12 +29,12 @@ import com.stripe.stripeterminal.external.callable.PaymentIntentCallback
 import com.stripe.stripeterminal.external.callable.ReaderCallback
 import com.stripe.stripeterminal.external.callable.TapToPayReaderListener
 import com.stripe.stripeterminal.external.callable.TerminalListener
-import com.stripe.stripeterminal.external.callable.AppsOnDevicesListener
+import com.stripe.stripeterminal.external.callable.HandoffReaderListener
 import com.stripe.stripeterminal.external.models.BatteryStatus
 import com.stripe.stripeterminal.external.models.CardPresentDetails
 import com.stripe.stripeterminal.external.models.Cart
 import com.stripe.stripeterminal.external.models.CartLineItem
-import com.stripe.stripeterminal.external.models.CollectPaymentIntentConfiguration
+import com.stripe.stripeterminal.external.models.CollectConfiguration
 import com.stripe.stripeterminal.external.models.ConnectionConfiguration
 import com.stripe.stripeterminal.external.models.ConnectionStatus
 import com.stripe.stripeterminal.external.models.DisconnectReason
@@ -128,12 +128,11 @@ class StripeTerminal(
             this.notifyListenersFunction
         )
         if (!isInitialized()) {
-            init(
+            initTerminal(
                 contextSupplier.get().applicationContext,
                 logLevel,
                 this.tokenProvider!!,
-                listener,
-                null // OfflineListener - not used in this implementation
+                listener
             )
         }
         Terminal.getInstance()
@@ -197,7 +196,7 @@ class StripeTerminal(
             config = DiscoveryConfiguration.BluetoothDiscoveryConfiguration(0, this.isTest!!)
             this.terminalConnectType = TerminalConnectTypes.Bluetooth
         } else if (call.getString("type") == TerminalConnectTypes.HandOff.webEventName) {
-            config = DiscoveryConfiguration.AppsOnDevicesDiscoveryConfiguration()
+            config = DiscoveryConfiguration.HandoffDiscoveryConfiguration()
             this.terminalConnectType = TerminalConnectTypes.HandOff
         } else {
             call.unimplemented(call.getString("type") + " is not support now")
@@ -400,8 +399,8 @@ class StripeTerminal(
 
         val config: ConnectionConfiguration.InternetConnectionConfiguration =
             ConnectionConfiguration.InternetConnectionConfiguration(
-                this.internetReaderListener,
-                true
+                true,
+                this.internetReaderListener
             )
         Terminal.getInstance().connectReader(foundReader, config, this.readerCallback(call))
     }
@@ -462,14 +461,14 @@ class StripeTerminal(
             return
         }
 
-        val config: ConnectionConfiguration.AppsOnDevicesConnectionConfiguration = ConnectionConfiguration.AppsOnDevicesConnectionConfiguration(
+        val config: ConnectionConfiguration.HandoffConnectionConfiguration = ConnectionConfiguration.HandoffConnectionConfiguration(
             this.handoffReaderListener
         )
 
         Terminal.getInstance().connectReader(foundReader, config, this.readerCallback(call))
     }
 
-    var handoffReaderListener: AppsOnDevicesListener = object : AppsOnDevicesListener {
+    var handoffReaderListener: HandoffReaderListener = object : HandoffReaderListener {
         override fun onDisconnect(reason: DisconnectReason) {
             notifyListeners(
                 TerminalEnumEvent.DisconnectedReader.webEventName,
@@ -540,8 +539,8 @@ class StripeTerminal(
     private val createPaymentIntentCallback: PaymentIntentCallback =
         object : PaymentIntentCallback {
             override fun onSuccess(paymentIntent: PaymentIntent) {
-                val collectConfig: CollectPaymentIntentConfiguration =
-                    CollectPaymentIntentConfiguration.Builder().updatePaymentIntent(true).build()
+                val collectConfig: CollectConfiguration =
+                    CollectConfiguration.Builder().updatePaymentIntent(true).build()
                 collectCancelable = Terminal.getInstance().collectPaymentMethod(
                     paymentIntent,
                     collectPaymentMethodCallback,

packages/terminal/android/src/main/java/com/getcapacitor/community/stripe/terminal/helper/TerminalMappers.kt

@@ -78,6 +78,7 @@ class TerminalMappers {
             DeviceType.STRIPE_S700 -> "stripeS700"
             DeviceType.STRIPE_S700_DEVKIT -> "stripeS700Devkit"
             DeviceType.UNKNOWN -> "unknown"
+            DeviceType.VERIFONE_P400 -> "verifoneP400"
             DeviceType.WISECUBE -> "wiseCube"
             DeviceType.WISEPAD_3 -> "wisePad3"
             DeviceType.WISEPAD_3S -> "wisePad3s"

packages/terminal/ios/Sources/StripeTerminalPlugin/StripeTerminal.swift

@@ -25,7 +25,7 @@ public class StripeTerminal: NSObject, DiscoveryDelegate, TerminalDelegate, Read
         self.isTest = call.getBool("isTest", true)
         if self.isInitialize == false {
             apiClient.initialize(plugin: self.plugin, tokenProviderEndpoint: call.getString("tokenProviderEndpoint", ""))
-            Terminal.initWithTokenProvider(apiClient)
+            Terminal.setTokenProvider(apiClient)
         }
         self.isInitialize = true
         self.plugin?.notifyListeners(TerminalEvents.Loaded.rawValue, data: [:])
@@ -249,14 +249,14 @@ public class StripeTerminal: NSObject, DiscoveryDelegate, TerminalDelegate, Read
                     print("confirmPaymentIntent failed: \(error)")
                     var errorDetails: [String: Any] = ["message": error.localizedDescription]
                     if let paymentIntent = error.paymentIntent,
-                       let lastPaymentError = paymentIntent.lastPaymentError {
-
-                        if let declineCode = lastPaymentError.declineCode {
-                            errorDetails["declineCode"] = declineCode
+                       let originalJSON = paymentIntent.originalJSON as? [AnyHashable: Any],
+                       let lastPaymentError = originalJSON["last_payment_error"] as? [String: Any] {
+                        if let errorCode = lastPaymentError["decline_code"] as? String {
+                            errorDetails["declineCode"] = errorCode
                         }
 
-                        if let code = lastPaymentError.code {
-                            errorDetails["code"] = code
+                        if let errorCode = lastPaymentError["code"] as? String {
+                            errorDetails["code"] = errorCode
                         }
                     }
                     self.plugin?.notifyListeners(TerminalEvents.Failed.rawValue, data: errorDetails)

packages/terminal/ios/Sources/StripeTerminalPlugin/TerminalMappers.swift

@@ -11,6 +11,7 @@ class TerminalMappers {
         case DeviceType.stripeM2: return "stripeM2"
         case DeviceType.stripeS700: return "stripeS700"
         case DeviceType.stripeS700DevKit: return "stripeS700Devkit"
+        case DeviceType.verifoneP400: return "verifoneP400"
         case DeviceType.wiseCube: return "wiseCube"
         case DeviceType.wisePad3: return "wisePad3"
         case DeviceType.wisePosE: return "wisePosE"
@@ -250,7 +251,6 @@ class TerminalMappers {
         case ConnectionStatus.connected: return "CONNECTED"
         case ConnectionStatus.connecting: return "CONNECTING"
         case ConnectionStatus.notConnected: return "NOT_CONNECTED"
-        case ConnectionStatus.reconnecting: return "RECONNECTING"
         default: return "UNKNOWN"
         }
     }