* [EACQAPW-5434] Remove tds controller crutches / handles

CHANGELOG.md

@@ -57,6 +57,7 @@
 * [EACQAPW-5827] Update fakes
 * [EACQAPW-5625] Added Card Options to pass DATA field in /AttachCard
 * [EACQAPW-5828] Combine all Core Fakes in one file
+* [EACQAPW-5434] Remove tds controller error handles
 
 ### Changed
 * [EACQAPW-5617] Now Receipt initializer checks validity of mandatory fields

ThirdParty/TdsSdkIos.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>TdsSdkIos.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>TdsSdkIos.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

ThirdParty/versions-info.md

@@ -1,2 +1,2 @@
 # ThreeDSWrapper - 2.2.3
-# TdsSdkIos - 2.0.2
+# TdsSdkIos - 2.0.3

TinkoffASDKUI/TinkoffASDKUI/BusinessLogic/CommonServcies/AppBasedThreeDS/TDSController.swift

@@ -53,11 +53,6 @@ final class TDSController: ITDSController {
     private let threeDSDeviceInfoProvider: IThreeDSDeviceInfoProvider
     private let mainQueue: any IDispatchQueue
 
-    // TODO: EACQAPW-5434 Убрать костыль задержки в TDSController
-    // Костыль нужен для решения проблемы одновременных анимаций модалок.
-    // Из-за этого не показывается шторка асдк с ошибкой оплаты
-    private let delayExecutor: IDelayedExecutor
-
     // 3ds sdk properties
 
     private var transaction: ITransaction?
@@ -76,15 +71,13 @@ final class TDSController: ITDSController {
         tdsTimeoutResolver: ITimeoutResolver,
         tdsCertsManager: ITDSCertsManager,
         threeDSDeviceInfoProvider: IThreeDSDeviceInfoProvider,
-        delayExecutor: IDelayedExecutor,
         mainQueue: IDispatchQueue
     ) {
         self.threeDsService = threeDsService
         self.tdsWrapper = tdsWrapper
         self.tdsTimeoutResolver = tdsTimeoutResolver
         self.tdsCertsManager = tdsCertsManager
         self.threeDSDeviceInfoProvider = threeDSDeviceInfoProvider
-        self.delayExecutor = delayExecutor
         self.mainQueue = mainQueue
     }
 
@@ -214,13 +207,6 @@ extension TDSController {
         )
     }
 
-    private func sendCompletionWithDelay(result: Result<GetPaymentStatePayload, Error>) {
-        delayExecutor.execute { [weak self] in
-            guard let self = self else { return }
-            self.completionHandler?(result)
-        }
-    }
-
     private func buildCresValue(with transStatus: String) throws -> String {
         guard let challengeParams = challengeParams else { return "" }
         let acsTransID = try challengeParams.getAcsTransactionId()
@@ -266,15 +252,13 @@ extension TDSController: ChallengeStatusReceiver {
 
     func cancelled() {
         finishTransaction()
-        delayExecutor.execute { [weak self] in
-            self?.cancelHandler?()
-        }
+        cancelHandler?()
         clear()
     }
 
     func timedout() {
         finishTransaction()
-        sendCompletionWithDelay(result: .failure(TDSFlowError.timeout))
+        completionHandler?(.failure(TDSFlowError.timeout))
         clear()
     }
 
@@ -283,7 +267,7 @@ extension TDSController: ChallengeStatusReceiver {
         let errorDescription = protocolErrorEvent.getErrorMessage().getErrorDescription()
         let errorCode = Int(protocolErrorEvent.getErrorMessage().getErrorCode()) ?? 1
         let error = NSError(domain: errorDescription, code: errorCode)
-        sendCompletionWithDelay(result: .failure(error))
+        completionHandler?(.failure(error))
         clear()
     }
 
@@ -292,7 +276,7 @@ extension TDSController: ChallengeStatusReceiver {
         let errorDescription = runtimeErrorEvent.getErrorMessage()
         let errorCode = Int(runtimeErrorEvent.getErrorCode()) ?? 1
         let error = NSError(domain: errorDescription, code: errorCode)
-        sendCompletionWithDelay(result: .failure(error))
+        completionHandler?(.failure(error))
         clear()
     }
 }

TinkoffASDKUI/TinkoffASDKUI/BusinessLogic/CommonServcies/AppBasedThreeDS/TDSControllerAssembly.swift

@@ -43,7 +43,6 @@ final class TDSControllerAssembly: ITDSControllerAssembly {
             tdsTimeoutResolver: TDSTimeoutResolver(),
             tdsCertsManager: tdsCertsManager,
             threeDSDeviceInfoProvider: threeDSDeviceInfoProvider,
-            delayExecutor: DelayedExecutor.buildDefault(),
             mainQueue: DispatchQueue.main
         )
     }

TinkoffASDKUI/TinkoffASDKUITests/TestCases/TDSControllerTests.swift

@@ -22,7 +22,6 @@ final class TDSControllerTests: BaseTestCase {
     var transactionMock: TransactionMock!
     var tdsCertsManagerMock: TDSCertsManagerMock!
     var threeDSDeviceInfoProviderMock: ThreeDSDeviceInfoProviderMock!
-    var delayExecutorMock: DelayedExecutorMock!
     var mainQueueMock: DispatchQueueMock!
 
     // MARK: - Setup
@@ -36,9 +35,7 @@ final class TDSControllerTests: BaseTestCase {
         transactionMock = TransactionMock()
         tdsCertsManagerMock = TDSCertsManagerMock()
         threeDSDeviceInfoProviderMock = ThreeDSDeviceInfoProviderMock()
-        delayExecutorMock = DelayedExecutorMock()
         mainQueueMock = DispatchQueueMock()
-        delayExecutorMock.executeWorkShouldExecute = true
         DispatchQueueMock.performOnMainBlockShouldExecute = true
 
         tDSWrapperMock.createTransactionReturnValue = transactionMock
@@ -49,13 +46,11 @@ final class TDSControllerTests: BaseTestCase {
             tdsTimeoutResolver: timeoutResolverMock,
             tdsCertsManager: tdsCertsManagerMock,
             threeDSDeviceInfoProvider: threeDSDeviceInfoProviderMock,
-            delayExecutor: delayExecutorMock,
             mainQueue: mainQueueMock
         )
     }
 
     override func tearDown() {
-        delayExecutorMock.executeWorkShouldExecute = false
         DispatchQueueMock.performOnMainBlockShouldExecute = false
 
         acquiringThreeDSServiceMock = nil
@@ -64,7 +59,6 @@ final class TDSControllerTests: BaseTestCase {
         transactionMock = nil
         tdsCertsManagerMock = nil
         threeDSDeviceInfoProviderMock = nil
-        delayExecutorMock = nil
         mainQueueMock = nil
 
         sut = nil