[DO NOT MERGE] COIOS-834: Update TwintSDK to v8.0.2

AdyenActions/Components/SDK/Twint+Injectable.swift

@@ -17,13 +17,33 @@ import Foundation
             }
         }
 
-        @objc func pay(withCode code: String, appConfiguration: TWAppConfiguration, callback: String) -> Error? {
-            Twint.pay(withCode: code, appConfiguration: appConfiguration, callback: callback)
+        @objc func pay(
+            withCode code: String,
+            appConfiguration: TWAppConfiguration,
+            callback: String,
+            completionHandler: @escaping (Error?) -> Void
+        ) {
+            Twint.pay(
+                withCode: code,
+                appConfiguration: appConfiguration,
+                callback: callback,
+                completionHandler: completionHandler
+            )
         }
 
         @objc
-        func registerForUOF(withCode code: String, appConfiguration: TWAppConfiguration, callback: String) -> Error? {
-            Twint.registerForUOF(withCode: code, appConfiguration: appConfiguration, callback: callback)
+        func registerForUOF(
+            withCode code: String,
+            appConfiguration: TWAppConfiguration,
+            callback: String,
+            completionHandler: @escaping (Error?) -> Void
+        ) {
+            Twint.registerForUOF(
+                withCode: code,
+                appConfiguration: appConfiguration,
+                callback: callback,
+                completionHandler: completionHandler
+            )
         }
 
         @objc func controller(

AdyenActions/Components/SDK/TwintSDKActionComponent.swift

@@ -120,32 +120,35 @@ import Foundation
         }
 
         private func invokeTwint(app: TWAppConfiguration, action: TwintSDKAction) {
-            let error: Error?
+            let completionHandler: (Error?) -> Void = { [weak self] error in
+                guard let self else { return }
+                if let error {
+                    self.handleShowError(error.localizedDescription)
+                    return
+                }
+
+                RedirectListener.registerForURL { [weak self] url in
+                    self?.twint.handleOpen(url) { [weak self] error in
+                        self?.handlePaymentResult(error: error, action: action)
+                    }
+                }
+            }
 
             if action.sdkData.isStored {
-                error = twint.registerForUOF(
+                twint.registerForUOF(
                     withCode: action.sdkData.token,
                     appConfiguration: app,
-                    callback: configuration.callbackAppScheme
+                    callback: configuration.callbackAppScheme,
+                    completionHandler: completionHandler
                 )
             } else {
-                error = twint.pay(
+                twint.pay(
                     withCode: action.sdkData.token,
                     appConfiguration: app,
-                    callback: configuration.callbackAppScheme
+                    callback: configuration.callbackAppScheme,
+                    completionHandler: completionHandler
                 )
             }
-
-            if let error {
-                handleShowError(error.localizedDescription)
-                return
-            }
-
-            RedirectListener.registerForURL { [weak self] url in
-                self?.twint.handleOpen(url) { [weak self] error in
-                    self?.handlePaymentResult(error: error, action: action)
-                }
-            }
         }
 
         private func presentAppChooser(for installedApps: [TWAppConfiguration], action: TwintSDKAction) {

Demo/SwiftUI/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSMinimumSystemVersion</key>
-	<string>14.0.0</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -68,6 +66,16 @@
 				<string>wx33ed7fe146f6a50a</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>twint-issuer24</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>twint-issuer24</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
@@ -76,6 +84,8 @@
 		<string>weixin</string>
 		<string>weixinULAPI</string>
 	</array>
+	<key>LSMinimumSystemVersion</key>
+	<string>14.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSPhotoLibraryAddUsageDescription</key>

Tests/IntegrationTests/Actions Tests/ActionComponent/Twint/Twint+Spy.swift

@@ -19,14 +19,16 @@ import Foundation
         internal typealias HandlePayBlock = (
             _ code: String,
             _ appConfiguration: TWAppConfiguration,
-            _ callbackAppScheme: String
-        ) -> Error?
+            _ callbackAppScheme: String,
+            _ completionHandler: @escaping ((any Error)?) -> Void
+        ) -> Void
 
         internal typealias HandleRegisterForUOF = (
             _ code: String,
             _ appConfiguration: TWAppConfiguration,
-            _ callbackAppScheme: String
-        ) -> Error?
+            _ callbackAppScheme: String,
+            _ completionHandler: @escaping ((any Error)?) -> Void
+        ) -> Void
 
         internal typealias HandleControllerBlock = (
             _ installedAppConfigurations: [TWAppConfiguration],
@@ -64,21 +66,23 @@ import Foundation
         ) {
             handleFetchInstalledAppConfigurations(completion)
         }
-    
+
         @objc override internal func pay(
             withCode code: String,
             appConfiguration: TWAppConfiguration,
-            callback callbackAppScheme: String
-        ) -> Error? {
-            handlePay(code, appConfiguration, callbackAppScheme)
+            callback callbackAppScheme: String,
+            completionHandler: @escaping ((any Error)?) -> Void
+        ) {
+            handlePay(code, appConfiguration, callbackAppScheme, completionHandler)
         }
 
         @objc override internal func registerForUOF(
             withCode code: String,
             appConfiguration: TWAppConfiguration,
-            callback: String
-        ) -> Error? {
-            handleRegisterForUOF(code, appConfiguration, callback)
+            callback: String,
+            completionHandler: @escaping (Error?) -> Void
+        ) {
+            handleRegisterForUOF(code, appConfiguration, callback, completionHandler)
         }
 
         @objc override internal func controller(

Tests/IntegrationTests/Actions Tests/ActionComponent/Twint/TwintSDKActionTests+Flows.swift

@@ -106,12 +106,12 @@ import XCTest
             let twintSpy = TwintSpy { configurationsBlock in
                 fetchBlockExpectation.fulfill()
                 configurationsBlock([.dummy])
-            } handlePay: { code, appConfiguration, callbackAppScheme in
+            } handlePay: { code, appConfiguration, callbackAppScheme, completionHandler in
                 payBlockExpectation.fulfill()
-                return nil
-            } handleRegisterForUOF: { _, _, _ in
+                completionHandler(nil)
+            } handleRegisterForUOF: { _, _, _, completionHandler in
                 XCTFail("RegisterForUOF should not have been called.")
-                return nil
+                completionHandler(nil)
             } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
                 XCTFail("Twint controller should not have been shown")
                 return nil

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

@@ -31,12 +31,12 @@ import XCTest
             let twintSpy = TwintSpy { configurationsBlock in
                 fetchBlockExpectation.fulfill()
                 configurationsBlock([])
-            } handlePay: { code, appConfiguration, callbackAppScheme in
+            } handlePay: { code, appConfiguration, callbackAppScheme, completionHandler in
                 XCTFail("Pay should not have been called")
-                return nil
-            } handleRegisterForUOF: { _, _, _ in
+                completionHandler(nil)
+            } handleRegisterForUOF: { _, _, _, completionHandler in
                 XCTFail("RegisterForUOF should not have been called.")
-                return nil
+                completionHandler(nil)
             } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
                 XCTFail("Twint controller should not have been shown")
                 return nil
@@ -86,16 +86,16 @@ import XCTest
             let twintSpy = TwintSpy { configurationsBlock in
                 fetchBlockExpectation.fulfill()
                 configurationsBlock([.dummy])
-            } handlePay: { code, appConfiguration, callbackAppScheme in
+            } handlePay: { code, appConfiguration, callbackAppScheme, completionHandler in
                 payBlockExpectation.fulfill()
                 XCTAssertEqual(code, TwintSDKAction.dummy.sdkData.token)
                 XCTAssertEqual(appConfiguration.appDisplayName, TWAppConfiguration.dummy.appDisplayName)
                 XCTAssertEqual(appConfiguration.appURLScheme, TWAppConfiguration.dummy.appURLScheme)
                 XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.callbackAppScheme)
-                return nil
-            } handleRegisterForUOF: { _, _, _ in
+                completionHandler(nil)
+            } handleRegisterForUOF: { _, _, _, completionHandler in
                 XCTFail("RegisterForUOF should not have been called.")
-                return nil
+                completionHandler(nil)
             } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
                 XCTFail("Twint controller should not have been shown")
                 return nil
@@ -139,16 +139,16 @@ import XCTest
             let twintSpy = TwintSpy { configurationsBlock in
                 fetchBlockExpectation.fulfill()
                 configurationsBlock(expectedAppConfigurations)
-            } handlePay: { code, appConfiguration, callbackAppScheme in
+            } handlePay: { code, appConfiguration, callbackAppScheme, completionHandler in
                 payBlockExpectation.fulfill()
                 XCTAssertEqual(code, TwintSDKAction.dummy.sdkData.token)
                 XCTAssertEqual(appConfiguration.appDisplayName, TWAppConfiguration.dummy.appDisplayName)
                 XCTAssertEqual(appConfiguration.appURLScheme, TWAppConfiguration.dummy.appURLScheme)
                 XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.callbackAppScheme)
-                return nil
-            } handleRegisterForUOF: { _, _, _ in
+                completionHandler(nil)
+            } handleRegisterForUOF: { _, _, _, completionHandler in
                 XCTFail("RegisterForUOF should not have been called.")
-                return nil
+                completionHandler(nil)
             } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
                 XCTAssertEqual(installedAppConfigurations, expectedAppConfigurations)
                 appSelectionHandler = selectionHandler
@@ -222,12 +222,13 @@ import XCTest
             let twintSpy = TwintSpy { configurationsBlock in
                 fetchBlockExpectation.fulfill()
                 configurationsBlock([.dummy])
-            } handlePay: { code, appConfiguration, callbackAppScheme in
+            } handlePay: { code, appConfiguration, callbackAppScheme, completionHandler in
                 payBlockExpectation.fulfill()
-                return MockError(errorDescription: expectedAlertMessage)
-            } handleRegisterForUOF: { _, _, _ in
+                let error = MockError(errorDescription: expectedAlertMessage)
+                completionHandler(error)
+            } handleRegisterForUOF: { _, _, _, completionHandler in
                 XCTFail("RegisterForUOF should not have been called.")
-                return nil
+                completionHandler(nil)
             } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
                 XCTFail("Twint controller should not have been shown")
                 return nil
@@ -270,16 +271,16 @@ import XCTest
             let twintSpy = TwintSpy { configurationsBlock in
                 fetchBlockExpectation.fulfill()
                 configurationsBlock([.dummy])
-            } handlePay: { _, _, _ in
+            } handlePay: { _, _, _, completionHandler in
                 XCTFail("Pay should not have been called.")
-                return nil
-            } handleRegisterForUOF: { code, appConfiguration, callbackAppScheme in
+                completionHandler(nil)
+            } handleRegisterForUOF: { code, appConfiguration, callbackAppScheme, completionHandler in
                 registerForUFO.fulfill()
                 XCTAssertEqual(code, TwintSDKAction.dummy.sdkData.token)
                 XCTAssertEqual(appConfiguration.appDisplayName, TWAppConfiguration.dummy.appDisplayName)
                 XCTAssertEqual(appConfiguration.appURLScheme, TWAppConfiguration.dummy.appURLScheme)
                 XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.callbackAppScheme)
-                return nil
+                completionHandler(nil)
             } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
                 XCTFail("Twint controller should not have been shown")
                 return nil
@@ -327,16 +328,16 @@ import XCTest
             let twintSpy = TwintSpy { configurationsBlock in
                 fetchBlockExpectation.fulfill()
                 configurationsBlock(expectedAppConfigurations)
-            } handlePay: { _, _, _ in
+            } handlePay: { _, _, _, completionHandler in
                 XCTFail("Pay should not have been called.")
-                return nil
-            } handleRegisterForUOF: { code, appConfiguration, callbackAppScheme in
+                completionHandler(nil)
+            } handleRegisterForUOF: { code, appConfiguration, callbackAppScheme, completionHandler in
                 registerForUFO.fulfill()
                 XCTAssertEqual(code, TwintSDKAction.dummy.sdkData.token)
                 XCTAssertEqual(appConfiguration.appDisplayName, TWAppConfiguration.dummy.appDisplayName)
                 XCTAssertEqual(appConfiguration.appURLScheme, TWAppConfiguration.dummy.appURLScheme)
                 XCTAssertEqual(callbackAppScheme, TwintSDKActionComponent.Configuration.dummy.callbackAppScheme)
-                return nil
+                completionHandler(nil)
             } handleController: { installedAppConfigurations, selectionHandler, cancelHandler in
                 XCTAssertEqual(installedAppConfigurations, expectedAppConfigurations)
                 appSelectionHandler = selectionHandler

XCFramework/Dynamic/TwintSDK.xcframework/Info.plist

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>TwintSDK.framework/TwintSDK</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
@@ -20,6 +22,8 @@
 			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>TwintSDK.framework/TwintSDK</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64</string>
 			<key>LibraryPath</key>

XCFramework/Dynamic/TwintSDK.xcframework/ios-arm64/TwintSDK.framework/Headers/Twint.h

@@ -11,31 +11,37 @@
 
 @interface Twint : NSObject
 
-typedef void(^TWResponseHandler)(NSError *error);
+typedef void (^TWResponseHandler)(NSError *error);
 
 typedef void (^TWInstalledAppFetchHandler)(NSArray<TWAppConfiguration *>* installedAppConfigurations);
 
 typedef void (^TWAppChooserSelectionHandler)(TWAppConfiguration* selectedConfiguration);
 
 typedef void (^TWAppChooserCancelHandler)(void);
 
+typedef void (^TWOpenTwintAppResultHandler)(NSError *error);
+
 /** 
  * Calls the Twint app to execute a payment for a known code
  * @param code The transaction code
  * @param appConfiguration The app configuration with which the payment will be executed
  * @param callbackAppScheme The callback app scheme invoked once the Twint app is done with the payment
- * @return Returns a NSError object which is nil in case of successful call
+ * @param completionHandler The block which will be executed with an NSError object or nil in case of success
  */
-+ (NSError*)payWithCode:(NSString*)code appConfiguration:(TWAppConfiguration *)appConfiguration callback:(NSString*)callbackAppScheme;
++ (void)payWithCode:(NSString*)code appConfiguration:(TWAppConfiguration *)appConfiguration callback:(NSString*)callbackAppScheme completionHandler:(TWOpenTwintAppResultHandler)completionHandler;
+
++ (NSError*)payWithCode:(NSString*)code appConfiguration:(TWAppConfiguration *)appConfiguration callback:(NSString*)callbackAppScheme __attribute__((deprecated("Use payWithCode:appConfiguration:callback:completionHandler: instead. This one fails on iOS 18 when using Xcode 16.")));
 
 /**
  * This method starts the registration process in the Twint app with a given code
  * @param code The transaction code
  * @param appConfiguration The app configuration with which the registration will be executed
  * @param callbackAppScheme The callback app scheme invoked once the Twint app is done with the registration
- * @return Returns a NSError object which is nil in case of successful call
+ * @param completionHandler The block which will be executed with an NSError object or nil in case of success
  */
-+ (NSError *)registerForUOFWithCode:(NSString *)code appConfiguration:(TWAppConfiguration *)appConfiguration callback:(NSString *)callbackAppScheme;
++ (void)registerForUOFWithCode:(NSString *)code appConfiguration:(TWAppConfiguration *)appConfiguration callback:(NSString *)callbackAppScheme completionHandler:(TWOpenTwintAppResultHandler)completionHandler;
+
++ (NSError *)registerForUOFWithCode:(NSString *)code appConfiguration:(TWAppConfiguration *)appConfiguration callback:(NSString *)callbackAppScheme __attribute__((deprecated("Use registerForUOFWithCode:appConfiguration:callback:completionHandler: instead. This one fails on iOS 18 when using Xcode 16.")));
 
 /**
  * Fetches all available app configurations from a remote and returns all that are potentially installed on the device. If there is an error during the fetch, the cache will be used. If there is nothing in the cache yet, all Twint apps will be probed until one is found that is installed.

XCFramework/Dynamic/TwintSDK.xcframework/ios-arm64/TwintSDK.framework/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module TwintSDK {
   umbrella header "TwintSDK.h"
-
   export *
+
   module * { export * }
 }