feat(ad-hoc): backport reworked 3DS

Example/Example/Sources/UI/Modules/AlternativePayments/Interactor/AlternativePaymentsInteractor.swift

@@ -111,7 +111,7 @@ final class AlternativePaymentsInteractor {
             source: response.gatewayToken,
             allowFallbackToSale: true
         )
-        let threeDSService = POTest3DSService(returnUrl: Example.Constants.returnUrl)
+        let threeDSService = POTest3DSService()
         try await invoicesService.authorizeInvoice(request: authorizationRequest, threeDSService: threeDSService)
     }
 
@@ -132,7 +132,7 @@ final class AlternativePaymentsInteractor {
             tokenId: token.id,
             source: try await alternativePaymentsService.tokenize(request: tokenizationRequest).gatewayToken
         )
-        let threeDSService = POTest3DSService(returnUrl: Example.Constants.returnUrl)
+        let threeDSService = POTest3DSService()
         return try await tokensService.assignCustomerToken(request: tokenAssignRequest, threeDSService: threeDSService)
     }
 
@@ -142,7 +142,7 @@ final class AlternativePaymentsInteractor {
             source: customerToken.id,
             allowFallbackToSale: true
         )
-        let threeDSService = POTest3DSService(returnUrl: Example.Constants.returnUrl)
+        let threeDSService = POTest3DSService()
         try await invoicesService.authorizeInvoice(request: invoiceAuthorizationRequest, threeDSService: threeDSService)
     }
 

Example/Example/Sources/UI/Modules/ApplePay/ViewModel/ApplePayViewModel.swift

@@ -58,7 +58,7 @@ final class ApplePayViewModel: ObservableObject {
                 let authorizationRequest = POInvoiceAuthorizationRequest(
                     invoiceId: invoice.id, source: card.id
                 )
-                let threeDSService = POTest3DSService(returnUrl: Constants.returnUrl)
+                let threeDSService = POTest3DSService()
                 try await invoicesService.authorizeInvoice(
                     request: authorizationRequest, threeDSService: threeDSService
                 )

Example/Example/Sources/UI/Modules/CardPayment/ViewModel/CardPaymentViewModel.swift

@@ -9,7 +9,6 @@ import Combine
 import SwiftUI
 @_spi(PO) import ProcessOut
 import ProcessOutUI
-import ProcessOutCheckout3DS
 
 @MainActor
 final class CardPaymentViewModel: ObservableObject {
@@ -38,7 +37,7 @@ final class CardPaymentViewModel: ObservableObject {
     private func commonInit() {
         state = .init(
             authenticationService: .init(
-                sources: [.test, .checkout], id: \.self, selection: .test
+                sources: [.test], id: \.self, selection: .test
             ),
             cardTokenization: nil
         )
@@ -92,36 +91,12 @@ extension CardPaymentViewModel: POCardTokenizationDelegate {
             saveSource: save,
             clientSecret: invoice.clientSecret
         )
-        let threeDSService: PO3DSService
-        switch state.authenticationService.selection {
-        case .test:
-            threeDSService = POTest3DSService(returnUrl: Constants.returnUrl)
-        case .checkout:
-            threeDSService = POCheckout3DSServiceBuilder()
-                .with(delegate: self)
-                .with(environment: .sandbox)
-                .build()
-        }
+        // todo(andrii-vysotskyi): allow selecting Checkout 3DS service when build issue is resolved.
+        let threeDSService = POTest3DSService()
         try await invoicesService.authorizeInvoice(request: invoiceAuthorizationRequest, threeDSService: threeDSService)
     }
 }
 
-extension CardPaymentViewModel: POCheckout3DSServiceDelegate {
-
-    func handle(redirect: PO3DSRedirect, completion: @escaping (Result<String, POFailure>) -> Void) {
-        Task { @MainActor in
-            let session = POWebAuthenticationSession(
-                redirect: redirect, returnUrl: Constants.returnUrl, completion: completion
-            )
-            if await session.start() {
-                return
-            }
-            let failure = POFailure(message: "Unable to process redirect", code: .generic(.mobile))
-            completion(.failure(failure))
-        }
-    }
-}
-
 extension CardPaymentViewModel {
 
     /// Convenience initializer that resolves its dependencies automatically.

Example/Example/Sources/UI/Modules/DynamicCheckout/ViewModel/DynamicCheckoutViewModel.swift

@@ -101,8 +101,8 @@ extension DynamicCheckoutViewModel: PODynamicCheckoutDelegate {
 
     func dynamicCheckout(
         willAuthorizeInvoiceWith request: inout POInvoiceAuthorizationRequest
-    ) async -> any PO3DSService {
-        POTest3DSService(returnUrl: Constants.returnUrl)
+    ) async -> any PO3DS2Service {
+        POTest3DSService()
     }
 
     func dynamicCheckout(willAuthorizeInvoiceWith request: PKPaymentRequest) async {

Example/project.yml

@@ -17,8 +17,8 @@ settings:
 packages:
   ProcessOutUI:
     path: ../
-  ProcessOutCheckout3DS:
-    path: ../
+  # ProcessOutCheckout3DS:
+  #   path: ../
 
 targets:
   Example:
@@ -34,7 +34,7 @@ targets:
       PRODUCT_BUNDLE_IDENTIFIER: com.processout.processout-example
     dependencies:
       - package: ProcessOutUI
-      - package: ProcessOutCheckout3DS
+      # - package: ProcessOutCheckout3DS
   ExampleUiTests:
     type: bundle.ui-testing
     sources: ExampleUiTests

Sources/ProcessOut/Sources/Api/ProcessOut.swift

@@ -28,7 +28,9 @@ public final class ProcessOut {
     /// Returns invoices service.
     public private(set) lazy var invoices: POInvoicesService = {
         let repository = HttpInvoicesRepository(connector: httpConnector)
-        return DefaultInvoicesService(repository: repository, threeDSService: threeDSService, logger: serviceLogger)
+        return DefaultInvoicesService(
+            repository: repository, customerActionsService: customerActionsService, logger: serviceLogger
+        )
     }()
 
     /// Returns alternative payment methods service.
@@ -37,7 +39,6 @@ public final class ProcessOut {
             let configuration = self.configuration
             return .init(projectId: configuration.projectId, baseUrl: configuration.environment.checkoutBaseUrl)
         }
-        let webSession = DefaultWebAuthenticationSession()
         return DefaultAlternativePaymentsService(
             configuration: serviceConfiguration, webSession: webSession, logger: serviceLogger
         )
@@ -69,7 +70,7 @@ public final class ProcessOut {
     public private(set) lazy var customerTokens: POCustomerTokensService = {
         let repository = HttpCustomerTokensRepository(connector: httpConnector)
         return DefaultCustomerTokensService(
-            repository: repository, threeDSService: threeDSService, logger: serviceLogger
+            repository: repository, customerActionsService: customerActionsService, logger: serviceLogger
         )
     }()
 
@@ -144,15 +145,17 @@ public final class ProcessOut {
         )
     }()
 
-    private lazy var threeDSService: ThreeDSService = {
+    private lazy var customerActionsService: CustomerActionsService = {
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .useDefaultKeys
         let encoder = JSONEncoder()
         encoder.dataEncodingStrategy = .base64
         encoder.keyEncodingStrategy = .useDefaultKeys
-        return DefaultThreeDSService(decoder: decoder, encoder: encoder)
+        return DefaultCustomerActionsService(decoder: decoder, encoder: encoder, webSession: webSession)
     }()
 
+    private let webSession = DefaultWebAuthenticationSession()
+
     // MARK: - Private Methods
 
     private init(configuration: ProcessOutConfiguration) {

Sources/ProcessOut/Sources/Api/Utils/Test3DS/POTest3DSService.swift

@@ -14,8 +14,13 @@ public final class POTest3DSService: PO3DSService {
 
     /// Creates service instance.
     @_disfavoredOverload
-    public init(returnUrl: URL) {
-        self.returnUrl = returnUrl
+    @available(*, deprecated, message: "Use init that doesn't require arguments.")
+    public nonisolated init(returnUrl: URL) {
+        // Ignored
+    }
+
+    nonisolated init() {
+        // Ignored
     }
 
     /// View controller to use for presentations.
@@ -51,21 +56,4 @@ public final class POTest3DSService: PO3DSService {
         alertController.addAction(rejectAction)
         viewController.present(alertController, animated: true)
     }
-
-    public func handle(redirect: PO3DSRedirect, completion: @escaping (Result<String, POFailure>) -> Void) {
-        let viewController = PO3DSRedirectViewControllerBuilder()
-            .with(redirect: redirect)
-            .with(returnUrl: returnUrl)
-            .with { [weak self] result in
-                self?.viewController.presentedViewController?.dismiss(animated: true) {
-                    completion(result)
-                }
-            }
-            .build()
-        self.viewController.present(viewController, animated: true)
-    }
-
-    // MARK: - Private Properties
-
-    private let returnUrl: URL
 }

Sources/ProcessOut/Sources/Generated/Sourcery+Generated.swift

@@ -157,7 +157,7 @@ extension POCustomerTokensService {
     @discardableResult
     public func assignCustomerToken(
         request: POAssignCustomerTokenRequest,
-        threeDSService: PO3DSService,
+        threeDSService: PO3DS2Service,
         completion: @escaping (Result<POCustomerToken, POFailure>) -> Void
     ) -> POCancellable {
         invoke(completion: completion) {
@@ -318,7 +318,7 @@ extension POInvoicesService {
     @discardableResult
     public func authorizeInvoice(
         request: POInvoiceAuthorizationRequest,
-        threeDSService: PO3DSService,
+        threeDSService: PO3DS2Service,
         completion: @escaping (Result<Void, POFailure>) -> Void
     ) -> POCancellable {
         invoke(completion: completion) {

Sources/ProcessOut/Sources/Repositories/CustomerTokens/Responses/AssignCustomerTokenResponse.swift

@@ -8,7 +8,7 @@
 struct AssignCustomerTokenResponse: Decodable {
 
     /// Optional customer action.
-    let customerAction: ThreeDSCustomerAction?
+    let customerAction: _CustomerAction?
 
     /// Token information.
     let token: POCustomerToken?

Sources/ProcessOut/Sources/Repositories/Invoices/HttpInvoicesRepository.swift

@@ -56,9 +56,9 @@ final class HttpInvoicesRepository: InvoicesRepository {
         return try await connector.execute(request: httpRequest).invoice
     }
 
-    func authorizeInvoice(request: POInvoiceAuthorizationRequest) async throws -> ThreeDSCustomerAction? {
+    func authorizeInvoice(request: POInvoiceAuthorizationRequest) async throws -> _CustomerAction? {
         struct Response: Decodable {
-            let customerAction: ThreeDSCustomerAction?
+            let customerAction: _CustomerAction?
         }
         let headers = [
             "X-Processout-Client-Secret": request.clientSecret

Sources/ProcessOut/Sources/Repositories/Invoices/InvoicesRepository.swift

@@ -24,7 +24,7 @@ protocol InvoicesRepository: PORepository {
     func invoice(request: POInvoiceRequest) async throws -> POInvoice
 
     /// Performs invoice authorization with given request.
-    func authorizeInvoice(request: POInvoiceAuthorizationRequest) async throws -> ThreeDSCustomerAction?
+    func authorizeInvoice(request: POInvoiceAuthorizationRequest) async throws -> _CustomerAction?
 
     /// Captures native alternative payment.
     func captureNativeAlternativePayment(

Sources/ProcessOut/Sources/Repositories/Shared/Responses/ThreeDSCustomerAction.swift → Sources/ProcessOut/Sources/Repositories/Shared/Responses/_CustomerAction.swift

@@ -1,13 +1,14 @@
 //
-//  ThreeDSCustomerAction.swift
+//  CustomerAction.swift
 //  ProcessOut
 //
 //  Created by Andrii Vysotskyi on 18.10.2022.
 //
 
 import Foundation
 
-struct ThreeDSCustomerAction: Decodable {
+// todo(andrii-vysotskyi): remove underscore when legacy codebase is removed.
+struct _CustomerAction: Decodable { // swiftlint:disable:this type_name
 
     enum ActionType: String, Decodable {
 

Sources/ProcessOut/Sources/Services/CustomerActions/CustomerActionsService.swift

@@ -0,0 +1,15 @@
+//
+//  CustomerActionsService.swift
+//  ProcessOut
+//
+//  Created by Andrii Vysotskyi on 02.11.2022.
+//
+
+protocol CustomerActionsService {
+
+    /// Implementation should attempt to handle given customer action.
+    /// - Parameters:
+    ///   - action: customer action to handle.
+    ///   - threeDSService: delegate that would perform 3DS2 handling
+    func handle(action: _CustomerAction, threeDSService: PO3DS2Service) async throws -> String
+}