1. Minor name changes 2. Need to call error when not 401

Author: tapashmajumder

swift-sdk/Internal/OnlineRequestProcessor.swift

@@ -116,10 +116,10 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
                dataFields: [AnyHashable: Any]? = nil,
                onSuccess: OnSuccessHandler? = nil,
                onFailure: OnFailureHandler? = nil) -> Pending<SendRequestValue, SendRequestError> {
-        applyCallbacks(successHandler: onSuccess,
-                       andFailureHandler: onFailure,
-                       withIdentifier: "trackEvent",
-                       forRequest: { apiClient.track(event: event, dataFields: dataFields) } )
+        sendRequest(requestProvider: { apiClient.track(event: event, dataFields: dataFields) },
+                    successHandler: onSuccess,
+                    failureHandler: onFailure,
+                    requestIdentifier: "trackEvent")
     }
 
     @discardableResult
@@ -259,15 +259,15 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
                        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 sendRequest(requestProvider: @escaping () -> Pending<SendRequestValue, SendRequestError>,
+                             successHandler onSuccess: OnSuccessHandler? = nil,
+                             failureHandler onFailure: OnFailureHandler? = nil,
+                             requestIdentifier identifier: String) -> Pending<SendRequestValue, SendRequestError> {
+        RequestProcessorUtil.sendRequest(requestProvider: requestProvider,
+                                         successHandler: onSuccess,
+                                         failureHandler: onFailure,
+                                         authManager: authManager,
+                                         requestIdentifier: identifier)
     }
 
     private func applyCallbacks(successHandler onSuccess: OnSuccessHandler? = nil,

swift-sdk/Internal/RequestProcessorUtil.swift

@@ -6,11 +6,11 @@ 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> {
+    static func sendRequest(requestProvider: @escaping () -> Pending<SendRequestValue, SendRequestError>,
+                            successHandler onSuccess: OnSuccessHandler? = nil,
+                            failureHandler onFailure: OnFailureHandler? = nil,
+                            authManager: IterableAuthManagerProtocol? = nil,
+                            requestIdentifier identifier: String) -> Pending<SendRequestValue, SendRequestError> {
         let result = Fulfill<SendRequestValue, SendRequestError>()
         requestProvider().onSuccess { json in
             reportSuccess(result: result, value: json, successHandler: onSuccess, identifier: identifier)
@@ -28,8 +28,10 @@ struct RequestProcessorUtil {
             } else if error.httpStatusCode == 401, error.iterableCode == JsonValue.Code.badApiKey {
                 ITBError(error.reason)
                 reportFailure(result: result, error: error, failureHandler: onFailure, identifier: identifier)
+            } else {
+                ITBError(error.reason)
+                reportFailure(result: result, error: error, failureHandler: onFailure, identifier: identifier)
             }
-            
         }
         return result
     }