Merge pull request #629 from devcsomnicg/MOB-6055

[MOB-6055] callback on setEmail/setUserId

Author: Ayyanchira

swift-sdk/Internal/InternalIterableAPI.swift

@@ -111,7 +111,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         _payloadData = data
     }
 
-    func setEmail(_ email: String?, authToken: String? = nil) {
+    func setEmail(_ email: String?, authToken: String? = nil, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
         ITBInfo()
 
         if _email == email && email != nil && authToken != nil {
@@ -127,13 +127,15 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
 
         _email = email
         _userId = nil
+        _successCallback = successHandler
+        _failureCallback = failureHandler
 
         storeIdentifierData()
 
         onLogin(authToken)
     }
 
-    func setUserId(_ userId: String?, authToken: String? = nil) {
+    func setUserId(_ userId: String?, authToken: String? = nil, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
         ITBInfo()
 
         if _userId == userId && userId != nil && authToken != nil {
@@ -149,6 +151,8 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
 
         _email = nil
         _userId = userId
+        _successCallback = successHandler
+        _failureCallback = failureHandler
 
         storeIdentifierData()
 
@@ -167,6 +171,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         guard let appName = pushIntegrationName else {
             let errorMessage = "Not registering device token - appName must not be nil"
             ITBError(errorMessage)
+            _failureCallback?(errorMessage, nil)
             onFailure?(errorMessage, nil)
             return
         }
@@ -181,8 +186,15 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
                                                   sdkVersion: localStorage.sdkVersion)
         requestHandler.register(registerTokenInfo: registerTokenInfo,
                                 notificationStateProvider: notificationStateProvider,
-                                onSuccess: onSuccess,
-                                onFailure: onFailure)
+                                onSuccess: { (_ data: [AnyHashable: Any]?) in
+                                                self._successCallback?(data)
+                                                onSuccess?(data)
+                                },
+                                onFailure: { (_ reason: String?, _ data: Data?) in
+                                                self._failureCallback?(reason, data)
+                                                onFailure?(reason, data)
+                                }
+        )
     }
 
     @discardableResult
@@ -428,6 +440,9 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     private var _email: String?
     private var _payloadData: [AnyHashable: Any]?
     private var _userId: String?
+    private var _successCallback: OnSuccessHandler? = nil
+    private var _failureCallback: OnFailureHandler? = nil
+
 
     /// the hex representation of this device token
     private var hexToken: String?
@@ -537,6 +552,8 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
 
         if config.autoPushRegistration {
             notificationStateProvider.registerForRemoteNotifications()
+        } else {
+            _successCallback?([:])
         }
 
         _ = inAppManager.scheduleSync()

swift-sdk/IterableAPI.swift

@@ -129,12 +129,12 @@ import UIKit
 
     // MARK: - SDK
 
-    public static func setEmail(_ email: String?, _ authToken: String? = nil) {
-        implementation?.setEmail(email, authToken: authToken)
+    public static func setEmail(_ email: String?, _ authToken: String? = nil, _ successHandler: OnSuccessHandler? = nil, _ failureHandler: OnFailureHandler? = nil) {
+        implementation?.setEmail(email, authToken: authToken, successHandler: successHandler, failureHandler: failureHandler)
     }
 
-    public static func setUserId(_ userId: String?, _ authToken: String? = nil) {
-        implementation?.setUserId(userId, authToken: authToken)
+    public static func setUserId(_ userId: String?, _ authToken: String? = nil, _ successHandler: OnSuccessHandler? = nil, _ failureHandler: OnFailureHandler? = nil) {
+        implementation?.setUserId(userId, authToken: authToken, successHandler: successHandler, failureHandler: failureHandler)
     }
 
     /// Handle a Universal Link

tests/unit-tests/IterableAPITests.swift

@@ -165,6 +165,78 @@ class IterableAPITests: XCTestCase {
 
         wait(for: [expectation], timeout: testExpectationTimeout)
     }
+
+    func testSetEmailWithCallbackSuccess() {
+        let expectation = XCTestExpectation(description: "Set email with callback success")
+
+        let config = IterableConfig()
+        let networkSession = MockNetworkSession(statusCode: 200)
+        let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config, networkSession: networkSession)
+                
+        internalAPI.setEmail("[email protected]", successHandler: { success in
+            XCTAssertNotNil(success)
+            expectation.fulfill()
+        }, failureHandler: { _, _ in
+            XCTFail("Failed to set email")
+            expectation.fulfill()
+        })
+
+        wait(for: [expectation], timeout: testExpectationTimeout)
+    }
+
+    func testSetEmailWithCallbackFailure() {
+        let expectation = XCTestExpectation(description: "Set email with callback failure")
+        
+        let config = IterableConfig()
+        let networkSession = MockNetworkSession(statusCode: 400)
+        let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config, networkSession: networkSession)
+
+        internalAPI.setEmail("invalid_email", successHandler: { success in
+            XCTFail("Email should not be set successfully")
+            expectation.fulfill()
+        }, failureHandler: { _, error in
+            XCTAssertNotNil(error)
+            expectation.fulfill()
+        })
+
+        wait(for: [expectation], timeout: testExpectationTimeout)
+    }
+
+    func testSetUserIdWithCallbackSuccess() {
+        let expectation = XCTestExpectation(description: "Set user ID with callback success")
+        
+        let config = IterableConfig()
+        let networkSession = MockNetworkSession(statusCode: 200)
+        let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config, networkSession: networkSession)
+        
+        internalAPI.setUserId("user123", successHandler: { success in
+            XCTAssertNil(success)
+            expectation.fulfill()
+        }, failureHandler: { _, _ in
+            XCTFail("Failed to set user ID")
+            expectation.fulfill()
+        })
+        
+        wait(for: [expectation], timeout: testExpectationTimeout)
+    }
+
+    func testSetUserIdWithCallbackFailure() {
+        let expectation = XCTestExpectation(description: "Set user ID with callback failure")
+        
+        let config = IterableConfig()
+        let networkSession = MockNetworkSession(statusCode: 400)
+        let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config, networkSession: networkSession)
+        
+        internalAPI.setUserId("user123", successHandler: { success in
+            XCTFail("User ID should not be set successfully")
+            expectation.fulfill()
+        }, failureHandler: { _, error in
+            XCTAssertNotNil(error)
+            expectation.fulfill()
+        })
+        
+        wait(for: [expectation], timeout: testExpectationTimeout)
+    }
 
     func testEmailPersistence() {
         let internalAPI = InternalIterableAPI.initializeForTesting()