Fixes realted to authRetry

updates related to retrymechanism from the apply function
Set authtoken=null scenario to better manage API retries

Author: hardikmashru

swift-sdk/Internal/AuthManager.swift

@@ -150,23 +150,21 @@ class AuthManager: IterableAuthManagerProtocol {
 
         pendingAuth = false
 
-        guard retrievedAuthToken != nil else {
-            delegate?.onTokenRegistrationFailed("auth token was nil, scheduling auth token retrieval in 10 seconds")
+        if retrievedAuthToken != nil {
+            let isRefreshQueued = queueAuthTokenExpirationRefresh(retrievedAuthToken, onSuccess: onSuccess)
+            if !isRefreshQueued {
+                onSuccess?(authToken)
+            }
+        } else {
+            delegate?.onTokenRegistrationFailed("auth token was nil, scheduling auth token retrieval in \(getNextRetryInterval()) seconds")
 
             /// by default, schedule a refresh for 10s
             scheduleAuthTokenRefreshTimer(interval: getNextRetryInterval(), successCallback: onSuccess)
-            
-            return
         }
 
         authToken = retrievedAuthToken
 
         storeAuthToken()
-        
-        let isRefreshQueued = queueAuthTokenExpirationRefresh(authToken, onSuccess: onSuccess)
-        if !isRefreshQueued {
-            onSuccess?(authToken)
-        }
     }
 
     private func queueAuthTokenExpirationRefresh(_ authToken: String?, onSuccess: AuthTokenRetrievalHandler? = nil) -> Bool {

swift-sdk/Internal/OfflineRequestProcessor.swift

@@ -319,7 +319,7 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
         return RequestCreator(auth: authProvider.auth, deviceMetadata: deviceMetadata)
     }
 
-    private func sendIterableRequest(requestGenerator: (RequestCreator) -> Result<IterableRequest, IterableError>,
+    private func sendIterableRequest(requestGenerator: @escaping (RequestCreator) -> Result<IterableRequest, IterableError>,
                                      successHandler onSuccess: OnSuccessHandler?,
                                      failureHandler onFailure: OnFailureHandler?,
                                      identifier: String) -> Pending<SendRequestValue, SendRequestError> {
@@ -343,11 +343,24 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
             SendRequestError.from(error: error)
         }.flatMap { taskId -> Pending<SendRequestValue, SendRequestError> in
             let pendingTask = notificationListener.futureFromTask(withTaskId: taskId)
-            return RequestProcessorUtil.apply(successHandler: onSuccess,
+            let result = RequestProcessorUtil.apply(successHandler: onSuccess,
                                               andFailureHandler: onFailure,
                                               andAuthManager: authManager,
                                               toResult: pendingTask,
                                               withIdentifier: identifier)
+            result.onError { error in
+                if error.httpStatusCode == 401, RequestProcessorUtil.matchesJWTErrorCode(error.iterableCode) {
+                    authManager?.setIsLastAuthTokenValid(false)
+                    let retryInterval = authManager?.getNextRetryInterval() ?? 1
+                    DispatchQueue.main.async {
+                        authManager?.scheduleAuthTokenRefreshTimer(interval: retryInterval, isScheduledRefresh: false, successCallback: { _ in
+                            _ = sendIterableRequest(requestGenerator: requestGenerator, successHandler: onSuccess, failureHandler: onFailure, identifier: identifier)
+                        })
+                    }
+
+                }
+            }
+            return result
         }
     }
 

swift-sdk/Internal/RequestProcessorUtil.swift

@@ -53,9 +53,6 @@ struct RequestProcessorUtil {
         }.onError { error in
             if error.httpStatusCode == 401, matchesJWTErrorCode(error.iterableCode) {
                 ITBError(error.reason)
-                authManager?.setIsLastAuthTokenValid(false)
-                let retryInterval = authManager?.getNextRetryInterval() ?? 1
-                authManager?.scheduleAuthTokenRefreshTimer(interval: retryInterval, isScheduledRefresh: false, successCallback: nil)
             } else if error.httpStatusCode == 401, error.iterableCode == JsonValue.Code.badApiKey {
                 ITBError(error.reason)
             }
@@ -126,7 +123,7 @@ struct RequestProcessorUtil {
         }
     }
 
-    private static func matchesJWTErrorCode(_ errorCode: String?) -> Bool {
+    public static func matchesJWTErrorCode(_ errorCode: String?) -> Bool {
         return errorCode == JsonValue.Code.invalidJwtPayload || errorCode == JsonValue.Code.badAuthorizationHeader || errorCode == JsonValue.Code.jwtUserIdentifiersMismatched
     }
 }