Automatic generation of request Id if missing

pagopa · May 25, 2024 · f29a9d8 · f29a9d8
1 parent 47d99bb
commit f29a9d8
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/ios/IoReactNativeHttpClient.swift b/ios/IoReactNativeHttpClient.swift
@@ -27,21 +27,19 @@ class IoReactNativeHttpClient: NSObject {
         let headers = headersFromConfig(config)
         let redirector = redirectorFromConfig(config)
         let timeoutSeconds = timeoutSecondsFromConfig(config)
-        let requestIdOpt = requestIdOptFromConfig(config)
+        let requestId = requestIdFromConfigOrRandom(config)
 
         let request = AF.request(url,
                    method: method,
                    parameters: parametersOpt,
                    headers: headers,
                    requestModifier: { $0.timeoutInterval = timeoutSeconds })
             .redirect(using: redirector)
-        if let requestId = requestIdOpt {
-            runningRequests.updateValue(request, forKey: requestId)
-        }
+
+        runningRequests.updateValue(request, forKey: requestId)
+
         request.responseString { response in
-            if let requestId = requestIdOpt {
-                self.runningRequests.removeValue(forKey: requestId)
-            }
+            self.runningRequests.removeValue(forKey: requestId)
             let isCancelled = request.isCancelled
             self.handleResponse(response, cancelled: isCancelled, resolve: resolve)
         }
@@ -135,8 +133,8 @@ class IoReactNativeHttpClient: NSObject {
         return 60
     }
 
-    func requestIdOptFromConfig(_ configOpt: [String: Any]?) -> String? {
-        return configOpt?["requestId"] as? String
+    func requestIdFromConfigOrRandom(_ configOpt: [String: Any]?) -> String {
+        return (configOpt?["requestId"] as? String) ?? NSUUID().uuidString
     }
 
     func handleResponse(_ response: AFDataResponse<String>, cancelled: Bool, resolve: @escaping RCTPromiseResolveBlock) -> Void {