COIOS-802: Identify native redirect flow (v5)

AdyenActions/Actions/Action.swift

@@ -11,7 +11,7 @@ public enum Action: Decodable {
 
     /// Indicates the user should be redirected to a URL.
     case redirect(RedirectAction)
-    
+
     /// Indicates the user should be redirected to an SDK.
     case sdk(SDKAction)
 

AdyenActions/Actions/RedirectAction.swift

@@ -9,24 +9,64 @@ import Foundation
 /// Describes an action in which the user is redirected to a URL.
 public struct RedirectAction: Decodable {
 
+    /// Defines the type of redirect flow utilized by the `RedirectAction` object.
+    public enum RedirectType: String, Decodable {
+        // swiftlint:disable redundant_string_enum_value
+        case redirect = "redirect"
+        case nativeRedirect = "nativeRedirect"
+
+        public init(from decoder: Decoder) throws {
+            let container = try decoder.singleValueContainer()
+            let type = try container.decode(String.self)
+            self = RedirectType(rawValue: type) ?? .redirect
+        }
+    }
+
     /// The URL to which to redirect the user.
     public let url: URL
-    
+
     /// The server-generated payment data that should be submitted to the `/payments/details` endpoint.
     public let paymentData: String?
-
+
+    /// Redirect type.
+    public let type: RedirectType
+
     /// Native redirect data.
     public let nativeRedirectData: String?
-    
+
     /// Initializes a redirect action.
     ///
     /// - Parameters:
     ///   - url: The URL to which to redirect the user.
     ///   - paymentData: The server-generated payment data that should be submitted to the `/payments/details` endpoint.
-    ///   - nativeRedirectData: Native redirect data.
-    public init(url: URL, paymentData: String?, nativeRedirectData: String? = nil) {
+    ///   - type: The redirect flow  used by the action. Defaults to `redirect`.
+    ///   - nativeRedirectData: Native redirect data. Defaults to `nil`.
+    public init(
+        url: URL,
+        paymentData: String?,
+        type: RedirectType = .redirect,
+        nativeRedirectData: String? = nil
+    ) {
         self.url = url
         self.paymentData = paymentData
+        self.type = type
         self.nativeRedirectData = nativeRedirectData
     }
+
+    public init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.url = try container.decode(URL.self, forKey: .url)
+        self.paymentData = try container.decodeIfPresent(String.self, forKey: .paymentData)
+        self.type = try container.decode(RedirectType.self, forKey: .type)
+        self.nativeRedirectData = try container.decodeIfPresent(String.self, forKey: .nativeRedirectData)
+    }
+
+    // MARK: - Private
+
+    private enum CodingKeys: CodingKey {
+        case url
+        case paymentData
+        case type
+        case nativeRedirectData
+    }
 }

AdyenActions/Components/Redirect/RedirectComponent.swift

@@ -172,14 +172,19 @@ public final class RedirectComponent: ActionComponent {
     }
 
     private func didOpen(url returnURL: URL, _ action: RedirectAction) throws {
-        if let redirectStateData = action.nativeRedirectData {
-            try handleNativeMobileRedirect(withReturnURL: returnURL, redirectStateData: redirectStateData, action)
-        } else {
+        switch action.type {
+        case .nativeRedirect:
+            try handleNativeMobileRedirect(
+                withReturnURL: returnURL,
+                redirectStateData: action.nativeRedirectData,
+                action
+            )
+        case .redirect:
             try notifyDelegateDidProvide(redirectDetails: RedirectDetails(returnURL: returnURL), action)
         }
     }
 
-    private func handleNativeMobileRedirect(withReturnURL returnURL: URL, redirectStateData: String, _ action: RedirectAction) throws {
+    private func handleNativeMobileRedirect(withReturnURL returnURL: URL, redirectStateData: String?, _ action: RedirectAction) throws {
         guard let queryString = returnURL.query else {
             throw Error.invalidRedirectParameters
         }

Tests/IntegrationTests/Actions Tests/Redirect/RedirectComponentTests.swift

@@ -283,7 +283,12 @@ class RedirectComponentTests: XCTestCase {
         }
         delegate.onDidFail = { _, _ in XCTFail("Should not call onDidFail") }
 
-        let action = RedirectAction(url: URL(string: "https://google.com")!, paymentData: nil, nativeRedirectData: "test_nativeRedirectData")
+        let action = RedirectAction(
+            url: URL(string: "https://google.com")!,
+            paymentData: nil,
+            type: .nativeRedirect,
+            nativeRedirectData: "test_nativeRedirectData"
+        )
         sut.handle(action)
         XCTAssertTrue(RedirectComponent.applicationDidOpen(from: URL(string: "url://?queryParam=value")!))
 
@@ -311,7 +316,12 @@ class RedirectComponentTests: XCTestCase {
             XCTFail("Should not call onDidProvide")
         }
 
-        let action = RedirectAction(url: URL(string: "https://google.com")!, paymentData: nil, nativeRedirectData: "test_nativeRedirectData")
+        let action = RedirectAction(
+            url: URL(string: "https://google.com")!,
+            paymentData: nil,
+            type: .nativeRedirect,
+            nativeRedirectData: "test_nativeRedirectData"
+        )
         sut.handle(action)
         XCTAssertFalse(RedirectComponent.applicationDidOpen(from: URL(string: "url://")!))
 
@@ -343,10 +353,54 @@ class RedirectComponentTests: XCTestCase {
             redirectExpectation.fulfill()
         }
 
-        let action = RedirectAction(url: URL(string: "https://google.com")!, paymentData: nil, nativeRedirectData: "test_nativeRedirectData")
+        let action = RedirectAction(
+            url: URL(string: "https://google.com")!,
+            paymentData: nil,
+            type: .nativeRedirect,
+            nativeRedirectData: "test_nativeRedirectData"
+        )
         sut.handle(action)
         XCTAssertTrue(RedirectComponent.applicationDidOpen(from: URL(string: "url://?queryParam=value")!))
 
         waitForExpectations(timeout: 10)
     }
+
+    func testNativeRedirectWithNativeRedirectDataNilShouldPerformNativeRedirectResultRequest() {
+        // Given
+        let apiClient = APIClientMock()
+        let sut = RedirectComponent(context: Dummy.context, apiClient: apiClient.retryAPIClient(with: SimpleScheduler(maximumCount: 2)))
+        apiClient.mockedResults = [.success(try! RedirectDetails(returnURL: URL(string: "url://?redirectResult=test_redirectResult")!))]
+
+        let appLauncher = AppLauncherMock()
+        sut.appLauncher = appLauncher
+        let appLauncherExpectation = expectation(description: "Expect appLauncher.openUniversalAppUrl() to be called")
+        appLauncher.onOpenUniversalAppUrl = { url, completion in
+            XCTAssertEqual(url, URL(string: "https://google.com")!)
+            completion?(true)
+            appLauncherExpectation.fulfill()
+        }
+
+        let delegate = ActionComponentDelegateMock()
+        sut.delegate = delegate
+        let redirectExpectation = expectation(description: "Expect redirect to be proccessed")
+        delegate.onDidProvide = { data, component in
+            XCTAssertTrue(component === sut)
+            XCTAssertNotNil(data.details)
+            redirectExpectation.fulfill()
+        }
+        delegate.onDidFail = { _, _ in XCTFail("Should not call onDidFail") }
+
+        // When
+        let action = RedirectAction(
+            url: URL(string: "https://google.com")!,
+            paymentData: nil,
+            type: .nativeRedirect,
+            nativeRedirectData: nil
+        )
+        sut.handle(action)
+
+        // Then
+        XCTAssertTrue(RedirectComponent.applicationDidOpen(from: URL(string: "url://?queryParam=value")!))
+        waitForExpectations(timeout: 10)
+    }
 }