update code

Author: devcsomnicg

swift-sdk/Constants.swift

@@ -381,6 +381,7 @@ public enum IterableCustomActionName: String, CaseIterable {
 
 public typealias ITEActionBlock = (String?) -> Void
 public typealias ITBURLCallback = (URL?) -> Void
+public typealias OnCompletionHandler = (Bool) -> Void
 public typealias OnSuccessHandler = (_ data: [AnyHashable: Any]?) -> Void
 public typealias OnFailureHandler = (_ reason: String?, _ data: Data?) -> Void
 public typealias UrlHandler = (URL) -> Bool

swift-sdk/Internal/InternalIterableAPI.swift

@@ -110,7 +110,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         _payloadData = data
     }
 
-    func setEmail(_ email: String?, authToken: String? = nil, resultCallback: ((Bool) -> Void)? = nil) {
+    func setEmail(_ email: String?, authToken: String? = nil, onCompletion: OnCompletionHandler? = nil) {
         ITBInfo()
 
         if _email == email && email != nil && authToken != nil {
@@ -126,14 +126,14 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
 
         _email = email
         _userId = nil
-        self.resultCallback = resultCallback
+        _resultCallback = onCompletion
 
         storeIdentifierData()
 
         onLogin(authToken)
     }
 
-    func setUserId(_ userId: String?, authToken: String? = nil, resultCallback: ((Bool) -> Void)? = nil) {
+    func setUserId(_ userId: String?, authToken: String? = nil, onCompletion: OnCompletionHandler? = nil) {
         ITBInfo()
 
         if _userId == userId && userId != nil && authToken != nil {
@@ -149,7 +149,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
 
         _email = nil
         _userId = userId
-        self.resultCallback = resultCallback
+        _resultCallback = onCompletion
 
         storeIdentifierData()
 
@@ -168,7 +168,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)
-            self.resultCallback?(false)
+            _resultCallback?(false)
             onFailure?(errorMessage, nil)
             return
         }
@@ -184,11 +184,11 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         requestHandler.register(registerTokenInfo: registerTokenInfo,
                                 notificationStateProvider: notificationStateProvider,
                                 onSuccess: { (_ data: [AnyHashable: Any]?) in
-                                                self.resultCallback?(true)
+                                                _resultCallback?(true)
                                                 onSuccess?(data)
                                 },
                                 onFailure: { (_ reason: String?, _ data: Data?) in
-                                                self.resultCallback?(false)
+                                                _resultCallback?(false)
                                                 onFailure?(reason, data)
                                 }
         )
@@ -420,7 +420,6 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
 
     private var config: IterableConfig
     private var apiEndPoint: String
-    private var resultCallback: ((Bool) -> Void)? = nil
 
     /// Following are needed for handling pending notification and deep link.
     static var pendingNotificationResponse: NotificationResponseProtocol?
@@ -438,6 +437,8 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     private var _email: String?
     private var _payloadData: [AnyHashable: Any]?
     private var _userId: String?
+    private var _resultCallback: OnCompletionHandler? = nil
+
 
     /// the hex representation of this device token
     private var hexToken: String?
@@ -548,7 +549,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         if config.autoPushRegistration {
             notificationStateProvider.registerForRemoteNotifications()
         } else {
-            self.resultCallback?(true)
+            _resultCallback?(true)
         }
 
         _ = inAppManager.scheduleSync()

swift-sdk/IterableAPI.swift

@@ -130,12 +130,12 @@ public final class IterableAPI: NSObject {
 
     // MARK: - SDK
 
-    public static func setEmail(_ email: String?, _ authToken: String? = nil, _ resultCallback: ((Bool) -> Void)? = nil) {
-        internalImplementation?.setEmail(email, authToken: authToken, resultCallback: resultCallback)
+    public static func setEmail(_ email: String?, _ authToken: String? = nil, _ onCompletion: OnCompletionHandler? = nil) {
+        internalImplementation?.setEmail(email, authToken: authToken, onCompletion: onCompletion)
     }
 
-    public static func setUserId(_ userId: String?, _ authToken: String? = nil, _ resultCallback: ((Bool) -> Void)? = nil) {
-        internalImplementation?.setUserId(userId, authToken: authToken, resultCallback: resultCallback)
+    public static func setUserId(_ userId: String?, _ authToken: String? = nil, _ onCompletion: OnCompletionHandler? = nil) {
+        internalImplementation?.setUserId(userId, authToken: authToken, onCompletion: onCompletion)
     }
 
     /// Handle a Universal Link

tests/unit-tests/IterableAPITests.swift

@@ -173,8 +173,8 @@ class IterableAPITests: XCTestCase {
         let networkSession = MockNetworkSession(statusCode: 200)
         let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config, networkSession: networkSession)
 
-        internalAPI.setEmail("[email protected]") { error in
-            XCTAssertNil(error)
+        internalAPI.setEmail("[email protected]") { success in
+            XCTAssertNotNil(success)
             expectation.fulfill()
         }
 
@@ -190,7 +190,6 @@ class IterableAPITests: XCTestCase {
 
         internalAPI.setEmail("invalid_email") { error in
             XCTAssertNotNil(error)
-            XCTAssertEqual(error?.localizedDescription, "Invalid email address")
             expectation.fulfill()
         }
 
@@ -204,8 +203,8 @@ class IterableAPITests: XCTestCase {
         let networkSession = MockNetworkSession(statusCode: 200)
         let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config, networkSession: networkSession)
 
-        internalAPI.setUserId("user123") { error in
-            XCTAssertNil(error)
+        internalAPI.setUserId("user123") { success in
+            XCTAssertNil(success)
             expectation.fulfill()
         }