Retry track event requests

Author: tapashmajumder

swift-sdk/Internal/NetworkHelper.swift

@@ -83,12 +83,14 @@ struct NetworkHelper {
             switch result {
             case let .success(value):
                 #if NETWORK_DEBUG
-                print("request with requestId: \(requestId) successfully sent")
+                print("request with id: \(requestId) successfully sent, response:")
+                print(value)
                 #endif
                 fulfill.resolve(with: value)
             case let .failure(error):
                 #if NETWORK_DEBUG
                 print("request with id: \(requestId) errored")
+                print(error)
                 #endif
                 fulfill.reject(with: error)
             }

swift-sdk/Internal/OnlineRequestProcessor.swift

@@ -119,7 +119,7 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
         applyCallbacks(successHandler: onSuccess,
                        andFailureHandler: onFailure,
                        withIdentifier: "trackEvent",
-                       forResult: apiClient.track(event: event, dataFields: dataFields))
+                       forRequest: { apiClient.track(event: event, dataFields: dataFields) } )
     }
 
     @discardableResult
@@ -258,6 +258,17 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
                        withIdentifier: "disableDevice",
                        forResult: apiClient.disableDevice(forAllUsers: allUsers, hexToken: hexToken))
     }
+
+    private func applyCallbacks(successHandler onSuccess: OnSuccessHandler? = nil,
+                                andFailureHandler onFailure: OnFailureHandler? = nil,
+                                withIdentifier identifier: String,
+                                forRequest request: @escaping () -> Pending<SendRequestValue, SendRequestError>) -> Pending<SendRequestValue, SendRequestError> {
+        RequestProcessorUtil.apply(successHandler: onSuccess,
+                                   andFailureHandler: onFailure,
+                                   andAuthManager: authManager,
+                                   forRequest: request,
+                                   withIdentifier: identifier)
+    }
 
     private func applyCallbacks(successHandler onSuccess: OnSuccessHandler? = nil,
                                 andFailureHandler onFailure: OnFailureHandler? = nil,

swift-sdk/Internal/RequestProcessorUtil.swift

@@ -5,6 +5,31 @@
 import Foundation
 
 struct RequestProcessorUtil {
+    @discardableResult
+    static func apply(successHandler onSuccess: OnSuccessHandler? = nil,
+                      andFailureHandler onFailure: OnFailureHandler? = nil,
+                      andAuthManager authManager: IterableAuthManagerProtocol? = nil,
+                      forRequest requestProvider: @escaping () -> Pending<SendRequestValue, SendRequestError>,
+                      withIdentifier identifier: String) -> Pending<SendRequestValue, SendRequestError> {
+        let result = Fulfill<SendRequestValue, SendRequestError>()
+        requestProvider().onSuccess { json in
+            reportSuccess(result: result, value: json, successHandler: onSuccess, identifier: identifier)
+        }
+        .onError { error in
+            requestProvider().onSuccess { json in
+                reportSuccess(result: result, value: json, successHandler: onSuccess, identifier: identifier)
+            }.onError { error in
+                if let onFailure = onFailure {
+                    onFailure(error.reason, error.data)
+                } else {
+                    defaultOnFailure(identifier)(error.reason, error.data)
+                }
+                result.reject(with: error)
+            }
+        }
+        return result
+    }
+
     @discardableResult
     static func apply(successHandler onSuccess: OnSuccessHandler? = nil,
                       andFailureHandler onFailure: OnFailureHandler? = nil,
@@ -34,26 +59,38 @@ struct RequestProcessorUtil {
         return result
     }
 
-    private static func defaultOnSuccess(_ identifier: String) -> OnSuccessHandler {
-    { data in
-        if let data = data {
-            ITBInfo("\(identifier) succeeded, got response: \(data)")
+    private static func reportSuccess(result: Fulfill<SendRequestValue, SendRequestError>,
+                                      value: SendRequestValue,
+                                      successHandler onSuccess: OnSuccessHandler?,
+                                      identifier: String) {
+        if let onSuccess = onSuccess {
+            onSuccess(value)
         } else {
-            ITBInfo("\(identifier) succeeded.")
+            Self.defaultOnSuccess(identifier)(value)
         }
+        result.resolve(with: value)
+    }
+    
+    private static func defaultOnSuccess(_ identifier: String) -> OnSuccessHandler {
+        { data in
+            if let data = data {
+                ITBInfo("\(identifier) succeeded, got response: \(data)")
+            } else {
+                ITBInfo("\(identifier) succeeded.")
+            }
         }
     }
 
     private static func defaultOnFailure(_ identifier: String) -> OnFailureHandler {
-    { reason, data in
-        var toLog = "\(identifier) failed:"
-        if let reason = reason {
-            toLog += ", \(reason)"
-        }
-        if let data = data {
-            toLog += ", got response \(String(data: data, encoding: .utf8) ?? "nil")"
-        }
-        ITBError(toLog)
+        { reason, data in
+            var toLog = "\(identifier) failed:"
+            if let reason = reason {
+                toLog += ", \(reason)"
+            }
+            if let data = data {
+                toLog += ", got response \(String(data: data, encoding: .utf8) ?? "nil")"
+            }
+            ITBError(toLog)
         }
     }
 }

tests/unit-tests/AuthTests.swift

@@ -753,6 +753,51 @@ class AuthTests: XCTestCase {
         wait(for: [condition1], timeout: testExpectationTimeoutForInverted)
     }
 
+    func testRetryJwtFailure() throws {
+        let expectation1 = expectation(description: "called track request")
+        expectation1.expectedFulfillmentCount = 2
+        let expectation2 = expectation(description: "pass in second attempt")
+        
+        let config = IterableConfig()
+        let authDelegate = createStockAuthDelegate()
+        config.authDelegate = authDelegate
+        
+        var callNumber = 0
+        let networkSession = MockNetworkSession()
+        networkSession.responseCallback = { url in
+            if url.absoluteString.contains("track") {
+                callNumber += 1
+                if callNumber == 1 {
+                    return MockNetworkSession.MockResponse(statusCode: 401,
+                                                           data: [JsonKey.Response.iterableCode: JsonValue.Code.invalidJwtPayload].toJsonData())
+                } else {
+                    return MockNetworkSession.MockResponse()
+                }
+            } else {
+                return MockNetworkSession.MockResponse()
+            }
+        }
+        networkSession.requestCallback = { request in
+            if request.url?.absoluteString.contains("track") == true {
+                expectation1.fulfill()
+            }
+        }
+        
+        let api = InternalIterableAPI.initializeForTesting(
+            config: config,
+            networkSession: networkSession
+        )
+        api.userId = "some-user-id"
+        api.track("some-event").onSuccess { _ in
+            print("success")
+            expectation2.fulfill()
+        }.onError { error in
+            print("error, \(error)")
+            XCTFail()
+        }
+        wait(for: [expectation1, expectation2], timeout: testExpectationTimeout)
+    }
+
     // MARK: - Private
 
     class DefaultAuthDelegate: IterableAuthDelegate {