Implement timeout for Risk SDK

checkout · Aug 2, 2024 · 1aeb8c1 · 1aeb8c1
1 parent b4fd428
commit 1aeb8c1
Showing 1 changed file with 43 additions and 12 deletions.
diff --git a/Checkout/Source/Tokenisation/CheckoutAPIService.swift b/Checkout/Source/Tokenisation/CheckoutAPIService.swift
@@ -145,6 +145,10 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
     }
   }
 
+  let timeoutInterval: TimeInterval = 10
+  let taskCompletionQueue = DispatchQueue(label: "taskCompletionQueue")
+  var isTaskCompleted = false
+
   private func createToken(requestParameters: NetworkManager.RequestParameters,
                            paymentType: TokenRequest.TokenType,
                            completion: @escaping (Result<TokenDetails, TokenisationError.TokenRequest>) -> Void) {
@@ -164,19 +168,26 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
           return
         }
 
-        self.riskSDK.configure { configurationResult in
-              switch configurationResult {
-              case .failure:
-                  completion(.success(tokenDetails))
-                  logManager.resetCorrelationID()
-              case .success():
-                  self.riskSDK.publishData(cardToken: tokenDetails.token) { _ in
-                      logManager.queue(event: .riskSDKCompletion)
-                      completion(.success(tokenDetails))
-                      logManager.resetCorrelationID()
-                  }
-              }
+        DispatchQueue.global().asyncAfter(deadline: .now() + timeoutInterval) {
+          self.taskCompletionQueue.sync { [weak self] in
+            guard let self else { return }
+            if !isTaskCompleted {
+              isTaskCompleted = true
+              completion(.failure(.networkError(.connectionTimeout)))
+            }
+          }
+        }
+
+        callRiskSDK(tokenDetails: tokenDetails) { [weak self] result in
+          guard let self else { return }
+          taskCompletionQueue.sync {
+            if !self.isTaskCompleted {
+              self.isTaskCompleted = true
+            }
           }
+          completion(result)
+        }
+
       case .errorResponse(let errorResponse):
         completion(.failure(.serverError(errorResponse)))
         logManager.resetCorrelationID()
@@ -187,6 +198,26 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
     }
   }
 
+  private func callRiskSDK(tokenDetails: TokenDetails,
+                           completion: @escaping (Result<TokenDetails, TokenisationError.TokenRequest>) -> Void) {
+    DispatchQueue.global().async {
+      self.riskSDK.configure { [weak self] configurationResult in
+        guard let self else { return }
+        switch configurationResult {
+        case .failure:
+          completion(.success(tokenDetails))
+          logManager.resetCorrelationID()
+        case .success():
+          self.riskSDK.publishData(cardToken: tokenDetails.token) { _ in
+            self.logManager.queue(event: .riskSDKCompletion)
+            completion(.success(tokenDetails))
+            self.logManager.resetCorrelationID()
+          }
+        }
+      }
+    }
+  }
+
   private func logTokenResponse(tokenResponseResult: NetworkRequestResult<TokenResponse, TokenisationError.ServerError>,
                                 paymentType: TokenRequest.TokenType,
                                 httpURLResponse: HTTPURLResponse?) {