Skip to content

[Mobile Payments] Fix Tap to Pay on iPhone setup failures on second account #8633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 18, 2023
Merged

[Mobile Payments] Fix Tap to Pay on iPhone setup failures on second account #8633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
434bfdd
8290 Update tests to simplify adding dependency
joshheald Jan 13, 2023
009a740
8290 Use one ReaderConfigProvider for the app’s lifetime
joshheald Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,11 +861,11 @@ private extension StripeCardReaderService {

private extension StripeCardReaderService {
private func setConfigProvider(_ configProvider: CardReaderConfigProvider) {
readerLocationProvider = configProvider
if !Terminal.hasTokenProvider() {
readerLocationProvider = configProvider

let tokenProvider = DefaultConnectionTokenProvider(provider: configProvider)
let tokenProvider = DefaultConnectionTokenProvider(provider: configProvider)

if !Terminal.hasTokenProvider() {
Terminal.setTokenProvider(tokenProvider)
}
}
Expand Down
14 changes: 14 additions & 0 deletions WooCommerce/Classes/ServiceLocator/ServiceLocator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ final class ServiceLocator {
private static var _cardReader: CardReaderService = NoOpCardReaderService()
#endif

private static var _cardReaderConfigProvider: CommonReaderConfigProviding = CommonReaderConfigProvider()

/// Support for printing receipts
///
private static var _receiptPrinter: PrinterService = AirPrintReceiptPrinterService()
Expand Down Expand Up @@ -207,6 +209,10 @@ final class ServiceLocator {
_cardReader
}

static var cardReaderConfigProvider: CommonReaderConfigProviding {
_cardReaderConfigProvider
}

/// Provides the access point to the ReceiptPrinterService.
/// - Returns: An implementation of the ReceiptPrinterService protocol.
static var receiptPrinterService: PrinterService {
Expand Down Expand Up @@ -336,6 +342,14 @@ extension ServiceLocator {
#endif
}

static func setCardReaderConfigProvider(_ mock: CommonReaderConfigProviding) {
guard isRunningTests() else {
return
}

_cardReaderConfigProvider = mock
}

static func setReceiptPrinter(_ mock: PrinterService) {
guard isRunningTests() else {
return
Expand Down
3 changes: 2 additions & 1 deletion WooCommerce/Classes/Yosemite/AuthenticatedState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ class AuthenticatedState: StoresManagerState {
CardPresentPaymentStore(dispatcher: dispatcher,
storageManager: storageManager,
network: network,
cardReaderService: ServiceLocator.cardReaderService),
cardReaderService: ServiceLocator.cardReaderService,
cardReaderConfigProvider: ServiceLocator.cardReaderConfigProvider),
ReceiptStore(dispatcher: dispatcher,
storageManager: storageManager,
network: network,
Expand Down
8 changes: 8 additions & 0 deletions Yosemite/Yosemite.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
02FF056B23DED3670058E6E7 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 02FF056A23DED3670058E6E7 /* Media.xcassets */; };
02FF056D23DEDCB90058E6E7 /* MockImageSourceWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FF056C23DEDCB90058E6E7 /* MockImageSourceWriter.swift */; };
02FF056F23E04F320058E6E7 /* MockMediaExportService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FF056E23E04F320058E6E7 /* MockMediaExportService.swift */; };
030C94A62971C73700F7F65D /* MockCommonReaderConfigProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030C94A52971C73700F7F65D /* MockCommonReaderConfigProviding.swift */; };
030C94A82971C96F00F7F65D /* CommonReaderConfigProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030C94A72971C96F00F7F65D /* CommonReaderConfigProvider.swift */; };
031C1EAA27B1702800298699 /* WCPayCharge+ReadOnlyConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 031C1EA927B1702800298699 /* WCPayCharge+ReadOnlyConvertible.swift */; };
031C1EAC27B1873200298699 /* WCPayCardPresentReceiptDetails+ReadOnlyConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 031C1EAB27B1873200298699 /* WCPayCardPresentReceiptDetails+ReadOnlyConvertible.swift */; };
031C1EAE27B1877000298699 /* WCPayCardPresentPaymentDetails+ReadOnlyConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 031C1EAD27B1877000298699 /* WCPayCardPresentPaymentDetails+ReadOnlyConvertible.swift */; };
Expand Down Expand Up @@ -541,6 +543,8 @@
02FF056A23DED3670058E6E7 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
02FF056C23DEDCB90058E6E7 /* MockImageSourceWriter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockImageSourceWriter.swift; sourceTree = "<group>"; };
02FF056E23E04F320058E6E7 /* MockMediaExportService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockMediaExportService.swift; sourceTree = "<group>"; };
030C94A52971C73700F7F65D /* MockCommonReaderConfigProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCommonReaderConfigProviding.swift; sourceTree = "<group>"; };
030C94A72971C96F00F7F65D /* CommonReaderConfigProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonReaderConfigProvider.swift; sourceTree = "<group>"; };
031C1EA927B1702800298699 /* WCPayCharge+ReadOnlyConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WCPayCharge+ReadOnlyConvertible.swift"; sourceTree = "<group>"; };
031C1EAB27B1873200298699 /* WCPayCardPresentReceiptDetails+ReadOnlyConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WCPayCardPresentReceiptDetails+ReadOnlyConvertible.swift"; sourceTree = "<group>"; };
031C1EAD27B1877000298699 /* WCPayCardPresentPaymentDetails+ReadOnlyConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WCPayCardPresentPaymentDetails+ReadOnlyConvertible.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1382,6 +1386,7 @@
B56C1EC120EAE2E500D749F9 /* ReadOnlyConvertible.swift */,
B52E002D211A3F5500700FDE /* ReadOnlyType.swift */,
0271E1652509CF0100633F7A /* AnyError.swift */,
030C94A72971C96F00F7F65D /* CommonReaderConfigProvider.swift */,
);
path = Tools;
sourceTree = "<group>";
Expand Down Expand Up @@ -1727,6 +1732,7 @@
isa = PBXGroup;
children = (
D88303EF25E45E6F00C877F9 /* MockCardReaderService.swift */,
030C94A52971C73700F7F65D /* MockCommonReaderConfigProviding.swift */,
D87F27DA25E7E8EA006EC8C9 /* MockCardReader.swift */,
D8652E4726307A5000350F37 /* MockReceiptPrinterService.swift */,
);
Expand Down Expand Up @@ -2057,6 +2063,7 @@
02124DAE2431C11600980D74 /* Media+ProductImage.swift in Sources */,
DEFD6D9526443CA100E51E0D /* SitePluginStore.swift in Sources */,
26577517243D5E42003168A5 /* ProductCategoryUpdated.swift in Sources */,
030C94A82971C96F00F7F65D /* CommonReaderConfigProvider.swift in Sources */,
261CF1F1255B389F0090D8D3 /* PaymentGatewayStore.swift in Sources */,
E18FDAFE28F97EB9008519BA /* AppAccountToken.swift in Sources */,
02FF055023D983F30058E6E7 /* ExportableAsset.swift in Sources */,
Expand Down Expand Up @@ -2300,6 +2307,7 @@
B9AECD482851F28E00E78584 /* Order+CardPresentPaymentTests.swift in Sources */,
02124DB02431C18700980D74 /* Media+ProductImageTests.swift in Sources */,
0248B3672459020500A271A4 /* ResultsController+FilterProductTests.swift in Sources */,
030C94A62971C73700F7F65D /* MockCommonReaderConfigProviding.swift in Sources */,
B54EAF2121188C470029C35E /* EntityListenerTests.swift in Sources */,
02FF056F23E04F320058E6E7 /* MockMediaExportService.swift in Sources */,
DE6831DD26445B2B00E88B9E /* SitePluginStoreTests.swift in Sources */,
Expand Down
75 changes: 4 additions & 71 deletions Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public final class CardPresentPaymentStore: Store {

/// Card reader config provider
///
private let commonReaderConfigProvider: CommonReaderConfigProvider
private let commonReaderConfigProvider: CommonReaderConfigProviding

private var paymentGatewayAccount: PaymentGatewayAccount? {
didSet {
Expand Down Expand Up @@ -51,10 +51,11 @@ public final class CardPresentPaymentStore: Store {
dispatcher: Dispatcher,
storageManager: StorageManagerType,
network: Network,
cardReaderService: CardReaderService
cardReaderService: CardReaderService,
cardReaderConfigProvider: CommonReaderConfigProviding
) {
self.cardReaderService = cardReaderService
self.commonReaderConfigProvider = CommonReaderConfigProvider()
self.commonReaderConfigProvider = cardReaderConfigProvider
self.remote = WCPayRemote(network: network)
self.stripeRemote = StripeRemote(network: network)
super.init(dispatcher: dispatcher, storageManager: storageManager, network: network)
Expand Down Expand Up @@ -370,74 +371,6 @@ private extension CardPresentPaymentStore {
onCompletion(publisher)
}
}
private extension CardPresentPaymentStore {
final class CommonReaderConfigProvider: CardReaderConfigProvider {
var siteID: Int64?
var readerConfigRemote: CardReaderCapableRemote?

public func setContext(siteID: Int64, remote: CardReaderCapableRemote) {
self.siteID = siteID
self.readerConfigRemote = remote
}

public func fetchToken(completion: @escaping(Result<String, Error>) -> Void) {
guard let siteID = self.siteID else {
return
}

readerConfigRemote?.loadConnectionToken(for: siteID) { result in
switch result {
case .success(let token):
completion(.success(token.token))
case .failure(let error):
if let configError = CardReaderConfigError(error: error) {
completion(.failure(configError))
} else {
completion(.failure(error))
}
}
}
}

public func fetchDefaultLocationID(completion: @escaping(Result<String, Error>) -> Void) {
guard let siteID = self.siteID else {
return
}

readerConfigRemote?.loadDefaultReaderLocation(for: siteID) { result in
switch result {
case .success(let location):
let readerLocation = location.toReaderLocation(siteID: siteID)
completion(.success(readerLocation.id))
case .failure(let error):
if let configError = CardReaderConfigError(error: error) {
completion(.failure(configError))
} else {
completion(.failure(error))
}
}
}
}
}
}

private extension CardReaderConfigError {
init?(error: Error) {
guard let dotcomError = error as? DotcomError else {
return nil
}
switch dotcomError {
case .unknown("store_address_is_incomplete", let message):
self = .incompleteStoreAddress(adminUrl: URL(string: message ?? ""))
return
case .unknown("postal_code_invalid", _):
self = .invalidPostalCode
return
default:
return nil
}
}
}

// MARK: Networking Methods
private extension CardPresentPaymentStore {
Expand Down
82 changes: 82 additions & 0 deletions Yosemite/Yosemite/Tools/CommonReaderConfigProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import Foundation
import Hardware
import Networking

public protocol CardReaderRemoteConfigLoading {
func setContext(siteID: Int64, remote: CardReaderCapableRemote)
}

public protocol CommonReaderConfigProviding: CardReaderRemoteConfigLoading & CardReaderConfigProvider {}


final public class CommonReaderConfigProvider: CommonReaderConfigProviding {
var siteID: Int64?
var readerConfigRemote: CardReaderCapableRemote?

public init(siteID: Int64? = nil, readerConfigRemote: CardReaderCapableRemote? = nil) {
self.siteID = siteID
self.readerConfigRemote = readerConfigRemote
}

public func setContext(siteID: Int64, remote: CardReaderCapableRemote) {
self.siteID = siteID
self.readerConfigRemote = remote
}

public func fetchToken(completion: @escaping(Result<String, Error>) -> Void) {
guard let siteID = self.siteID else {
return
}

readerConfigRemote?.loadConnectionToken(for: siteID) { result in
switch result {
case .success(let token):
completion(.success(token.token))
case .failure(let error):
if let configError = CardReaderConfigError(error: error) {
completion(.failure(configError))
} else {
completion(.failure(error))
}
}
}
}

public func fetchDefaultLocationID(completion: @escaping(Result<String, Error>) -> Void) {
guard let siteID = self.siteID else {
return
}

readerConfigRemote?.loadDefaultReaderLocation(for: siteID) { result in
switch result {
case .success(let location):
let readerLocation = location.toReaderLocation(siteID: siteID)
completion(.success(readerLocation.id))
case .failure(let error):
if let configError = CardReaderConfigError(error: error) {
completion(.failure(configError))
} else {
completion(.failure(error))
}
}
}
}
}

private extension CardReaderConfigError {
init?(error: Error) {
guard let dotcomError = error as? DotcomError else {
return nil
}
switch dotcomError {
case .unknown("store_address_is_incomplete", let message):
self = .incompleteStoreAddress(adminUrl: URL(string: message ?? ""))
return
case .unknown("postal_code_invalid", _):
self = .invalidPostalCode
return
default:
return nil
}
}
}
17 changes: 17 additions & 0 deletions Yosemite/YosemiteTests/Mocks/CardPresentPayments/MockCommonReaderConfigProviding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Foundation

@testable import Yosemite

final class MockCommonReaderConfigProviding: CommonReaderConfigProviding {
func fetchToken(completion: @escaping (Result<String, Error>) -> Void) {
completion(.success("mock_token"))
}

func fetchDefaultLocationID(completion: @escaping (Result<String, Error>) -> Void) {
completion(.success("mock_location"))
}

func setContext(siteID: Int64, remote: Yosemite.CardReaderCapableRemote) {
// no-op
}
}
Loading