Merge pull request #9763 from woocommerce/issue/9735-handle-site-change-during-reconnection

[Mobile Payments] Handle site change during TTP auto reconnection

Author: joshheald

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -15,6 +15,7 @@ public final class StripeCardReaderService: NSObject {
     private let discoveryStatusSubject = CurrentValueSubject<CardReaderServiceDiscoveryStatus, Never>(.idle)
     private let readerEventsSubject = PassthroughSubject<CardReaderEvent, Never>()
     private let softwareUpdateSubject = CurrentValueSubject<CardReaderSoftwareUpdateState, Never>(.none)
+    private var connectionAttemptInvalidated: Bool = false
 
     /// Volatile, in-memory cache of discovered readers. It has to be cleared after we connect to a reader
     /// see
@@ -287,6 +288,10 @@ extension StripeCardReaderService: CardReaderService {
             return
         }
 
+        if Terminal.shared.connectionStatus == .connecting {
+            connectionAttemptInvalidated = true
+        }
+
         Terminal.shared.clearCachedCredentials()
     }
 
@@ -354,6 +359,7 @@ extension StripeCardReaderService: CardReaderService {
             }.eraseToAnyPublisher()
         }
 
+        connectionAttemptInvalidated = false
         switch stripeReader.deviceType {
         case .appleBuiltIn:
             return getLocalMobileConfiguration(stripeReader, options: options).flatMap { configuration in
@@ -448,6 +454,10 @@ extension StripeCardReaderService: CardReaderService {
                 }
 
                 if let reader = reader {
+                    if self.connectionAttemptInvalidated {
+                        _ = self.disconnect()
+                        promise(.failure(CardReaderServiceError.connection(underlyingError: .connectionAttemptInvalidated)))
+                    }
                     self.connectedReadersSubject.send([CardReader(reader: reader)])
                     self.switchStatusToIdle()
                     promise(.success(CardReader(reader: reader)))
@@ -482,6 +492,10 @@ extension StripeCardReaderService: CardReaderService {
                 }
 
                 if let reader = reader {
+                    if self.connectionAttemptInvalidated {
+                        _ = self.disconnect()
+                        promise(.failure(CardReaderServiceError.connection(underlyingError: .connectionAttemptInvalidated)))
+                    }
                     self.connectedReadersSubject.send([CardReader(reader: reader)])
                     self.switchStatusToIdle()
                     promise(.success(CardReader(reader: reader)))

Hardware/Hardware/CardReader/UnderlyingError.swift

@@ -149,6 +149,9 @@ public enum UnderlyingError: Error, Equatable {
     /// There was no refund in progress to cancel
     case noRefundInProgress
 
+    /// Connection attempt invalidated while it was in progress – e.g. the store was changed during a connection
+    case connectionAttemptInvalidated
+
     // MARK: - Tap to Pay on iPhone related errors
 
     /// The device must have a passcode in order to use Tap to Pay on iPhone
@@ -408,6 +411,9 @@ extension UnderlyingError: LocalizedError {
             return NSLocalizedString("Sorry, this refund could not be canceled",
                                      comment: "Error message shown when a refund could not be canceled (likely because " +
                                      "it had already completed)")
+        case .connectionAttemptInvalidated:
+            return NSLocalizedString("Sorry, we could not connect to the reader. Please try again.",
+                                     comment: "Error message shown when an in-progress connection is cancelled by the system")
 
             // MARK: - Tap to Pay on iPhone errors
         case .passcodeNotEnabled: