Merge branch 'feature_Twint' into twint_action_full_test

Adyen.podspec

@@ -44,6 +44,7 @@ Pod::Spec.new do |s|
   s.subspec 'AdyenTwint' do |plugin|
     plugin.source_files = 'AdyenTwint/**/*.swift'
     plugin.dependency 'Adyen/Core'
+    plugin.dependency 'Adyen/Actions'
     plugin.dependency 'Adyen/TwintSDK'
   end
 

AdyenActions/AdyenActionComponent.swift

@@ -69,17 +69,31 @@ public final class AdyenActionComponent: ActionComponent, ActionHandlingComponen
 
         public struct Twint {
 
-            // TODO: Add documentation
-            public let returnUrlScheme: String
+            /// The callback app scheme invoked once the Twint app is done with the payment
+            public var callbackAppScheme: String
 
-            public init(returnUrlScheme: String) {
-                guard let url = URL(string: returnUrlScheme), let scheme = url.scheme, scheme == returnUrlScheme else {
-                    assertionFailure("Provided url scheme is not a scheme")
-                    self.returnUrlScheme = returnUrlScheme
-                    return
+            /// Initializes a new instance
+            ///
+            /// - Parameter callbackAppScheme: The callback app scheme invoked once the Twint app is done with the payment
+            ///
+            /// - Important: The value of ``callbackAppScheme`` is  required to only provide the scheme,
+            /// without a host/path/... (e.g. "my-app", not a url "my-app://...")
+            public init(callbackAppScheme: String) {
+                if !Self.isCallbackSchemeValid(callbackAppScheme) {
+                    assertionFailure("Format of provided callbackAppScheme '\(callbackAppScheme)' is incorrect.")
+                }
+
+                self.callbackAppScheme = callbackAppScheme
+            }
+
+            /// Validating whether or not the provided `callbackAppScheme` only contains a scheme
+            private static func isCallbackSchemeValid(_ callbackAppScheme: String) -> Bool {
+                if let url = URL(string: callbackAppScheme), url.scheme != nil {
+                    // If the scheme is not nil it means that more information than just the scheme was provided
+                    return false
                 }
 
-                self.returnUrlScheme = scheme
+                return true
             }
         }
 
@@ -232,7 +246,7 @@ public final class AdyenActionComponent: ActionComponent, ActionHandlingComponen
                 context: context,
                 configuration: .init(
                     style: configuration.style.awaitComponentStyle,
-                    returnUrlScheme: twintConfiguration.returnUrlScheme,
+                    callbackAppScheme: twintConfiguration.callbackAppScheme,
                     localizationParameters: configuration.localizationParameters
                 )
             )

AdyenActions/Components/SDK/TwintSDKActionComponent.swift

@@ -36,27 +36,27 @@ import Foundation
             /// The localization parameters, leave it nil to use the default parameters.
             public var localizationParameters: LocalizationParameters?
 
-            /// The return url scheme
+            /// The callback app scheme invoked once the Twint app is done with the payment
             ///
             /// - Important: This value is  required to only provide the scheme, without a host/path/.... (e.g. "my-app", not a url "my-app://...")
-            public let returnUrlScheme: String
+            public let callbackAppScheme: String
 
             /// Initializes an instance of `Configuration`
             ///
             /// - Parameters:
             ///   - style: The Component UI style.
-            ///   - returnUrlScheme: The url scheme of the app
+            ///   - callbackAppScheme: The callback app scheme invoked once the Twint app is done with the payment
             ///   - localizationParameters: The localization parameters, leave it nil to use the default parameters.
             ///
-            /// - Important: This value of ``returnUrlScheme`` is  required to only provide the scheme, without a host/path/... (e.g. "my-app", not a url "my-app://...")
+            /// - Important: The value of ``callbackAppScheme`` is  required to only provide the scheme, without a host/path/... (e.g. "my-app", not a url "my-app://...")
             public init(
                 style: AwaitComponentStyle = .init(),
-                returnUrlScheme: String,
+                callbackAppScheme: String,
                 localizationParameters: LocalizationParameters? = nil
             ) {
                 self.style = style
                 self.localizationParameters = localizationParameters
-                self.returnUrlScheme = returnUrlScheme
+                self.callbackAppScheme = callbackAppScheme
             }
         }
 
@@ -114,7 +114,7 @@ import Foundation
             let error = twint.pay(
                 withCode: action.sdkData.token,
                 appConfiguration: app,
-                callback: configuration.returnUrlScheme
+                callback: configuration.callbackAppScheme
             )
 
             if let error {

Demo/Common/IntegrationExamples/Protocols/InitialDataFlowProtocol.swift

@@ -48,7 +48,7 @@ extension InitialDataFlowProtocol {
                     requestorAppURL: ConfigurationConstants.returnUrl,
                     delegateAuthentication: ConfigurationConstants.delegatedAuthenticationConfigurations
                 ),
-                twint: .init(returnUrlScheme: ConfigurationConstants.returnUrl.scheme!)
+                twint: .init(callbackAppScheme: ConfigurationConstants.returnUrl.scheme!)
             )
         )
         return configuration

Demo/Configuration.swift

@@ -250,7 +250,7 @@ internal struct DemoAppSettings: Codable {
         if dropInSettings.cashAppPayEnabled {
             dropInConfig.cashAppPay = .init(redirectURL: ConfigurationConstants.returnUrl)
         }
-        dropInConfig.actionComponent.twint = .init(returnUrlScheme: ConfigurationConstants.returnUrl.scheme!)
+        dropInConfig.actionComponent.twint = .init(callbackAppScheme: ConfigurationConstants.returnUrl.scheme!)
 
         return dropInConfig
     }

Package.swift

@@ -188,6 +188,7 @@ let package = Package(
             name: "AdyenTwint",
             dependencies: [
                 .target(name: "Adyen"),
+		.target(name: "AdyenActions"),
 		.target(name: "TwintSDK")
             ],
             path: "AdyenTwint"

Tests/Actions Tests/ActionComponent/Twint/TwintSDKActionTests+Configuration.swift

@@ -0,0 +1,7 @@
+//
+// Copyright (c) 2024 Adyen N.V.
+//
+// This file is open source and available under the MIT license. See the LICENSE file for more info.
+//
+
+import Foundation

Tests/Actions Tests/ActionComponent/Twint/TwintSDKActionTests.swift

@@ -14,32 +14,6 @@ import TwintSDK
 
 #if canImport(TwintSDK)
 
-extension TWAppConfiguration {
-    static var dummy: TWAppConfiguration {
-        let twintAppConfiguration = TWAppConfiguration()
-        twintAppConfiguration.appDisplayName = "Test App"
-        twintAppConfiguration.appURLScheme = "scheme://"
-        return twintAppConfiguration
-    }
-}
-
-extension TwintSDKActionComponent.Configuration {
-    static var dummy: Self {
-        .init(returnUrlScheme: "ui-host")
-    }
-}
-
-extension TwintSDKAction {
-    static var dummy: TwintSDKAction {
-        .init(
-            sdkData: .init(token: "token"),
-            paymentData: "paymentData",
-            paymentMethodType: "paymentMethodType",
-            type: "type"
-        )
-    }
-}
-
 final class TwintSDKActionTests: XCTestCase {
 
     func testNoAppFound() throws {
@@ -110,7 +84,7 @@ final class TwintSDKActionTests: XCTestCase {
             XCTAssertEqual(code, TwintSDKAction.dummy.sdkData.token)
             XCTAssertEqual(appConfiguration.appDisplayName, TWAppConfiguration.dummy.appDisplayName)
             XCTAssertEqual(appConfiguration.appURLScheme, TWAppConfiguration.dummy.appURLScheme)
-            XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.returnUrl)
+            XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.callbackAppScheme)
             return nil
         } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
             XCTFail("Twint controller should not have been shown")
@@ -122,7 +96,8 @@ final class TwintSDKActionTests: XCTestCase {
 
         let twintActionComponent = Self.actionComponent(
             with: twintSpy,
-            presentationDelegate: Self.failingPresentationDelegateMock()
+            presentationDelegate: Self.failingPresentationDelegateMock(),
+            delegate: nil
         )
 
         // When
@@ -157,7 +132,7 @@ final class TwintSDKActionTests: XCTestCase {
             XCTAssertEqual(code, TwintSDKAction.dummy.sdkData.token)
             XCTAssertEqual(appConfiguration.appDisplayName, TWAppConfiguration.dummy.appDisplayName)
             XCTAssertEqual(appConfiguration.appURLScheme, TWAppConfiguration.dummy.appURLScheme)
-            XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.returnUrl)
+            XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.callbackAppScheme)
             return nil
         } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
             XCTAssertEqual(installedAppConfigurations, expectedAppConfigurations)
@@ -168,7 +143,7 @@ final class TwintSDKActionTests: XCTestCase {
             XCTFail("Handle open should not have been called")
             return false
         }
-
+        
         let twintActionComponent = TwintSDKActionComponent(
             context: Dummy.context,
             configuration: .dummy,