Call createUserForUserId if userId is set for registerToken.

Author: tapashmajumder

Tests/swift-sdk-swift-tests/IterableAutoRegistrationTests.swift

@@ -90,6 +90,7 @@ class IterableAutoRegistrationTests: XCTestCase {
     }
 
     func testDoNotCallRegisterForRemoteNotificationsWhenNotificationsAreDisabled() {
+        let expectation0 = expectation(description: "Call create user")
         let expectation1 = expectation(description: "Call registerToken API endpoint")
         let expectation2 = expectation(description: "Disable API endpoint called")
         let expectation3 = expectation(description: "do not call registerForRemoteNotifications")
@@ -107,23 +108,29 @@ class IterableAutoRegistrationTests: XCTestCase {
         IterableAPI.userId = "userId1"
         let token = "zeeToken".data(using: .utf8)!
         networkSession.callback = {(_, _, _) in
-            // first call back will be called on register
-            expectation1.fulfill()
-            TestUtils.validate(request: networkSession.request!, requestType: .post, apiEndPoint: .ITBL_ENDPOINT_API, path: .ITBL_PATH_REGISTER_DEVICE_TOKEN, queryParams: [(name: AnyHashable.ITBL_KEY_API_KEY, value: IterableAutoRegistrationTests.apiKey)])
+            expectation0.fulfill()
+            TestUtils.validate(request: networkSession.request!, requestType: .post, apiEndPoint: .ITBL_ENDPOINT_API, path: .ITBL_PATH_CREATE_USER, queryParams: [(name: AnyHashable.ITBL_KEY_API_KEY, value: IterableAutoRegistrationTests.apiKey)])
+            let body = networkSession.getRequestBody() as! [String : Any]
+            TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_USER_ID, andValue: "userId1", inDictionary: body)
             networkSession.callback = {(_, _, _) in
-                // second call back is for disable when we set new user id
-                TestUtils.validate(request: networkSession.request!, requestType: .post, apiEndPoint: .ITBL_ENDPOINT_API, path: .ITBL_PATH_DISABLE_DEVICE, queryParams: [(name: AnyHashable.ITBL_KEY_API_KEY, value: IterableAutoRegistrationTests.apiKey)])
-                let body = networkSession.getRequestBody() as! [String : Any]
-                TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_TOKEN, andValue: (token as NSData).iteHexadecimalString(), inDictionary: body)
-                TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_USER_ID, andValue: "userId1", inDictionary: body)
-                expectation2.fulfill()
+                // first call back will be called on register
+                expectation1.fulfill()
+                TestUtils.validate(request: networkSession.request!, requestType: .post, apiEndPoint: .ITBL_ENDPOINT_API, path: .ITBL_PATH_REGISTER_DEVICE_TOKEN, queryParams: [(name: AnyHashable.ITBL_KEY_API_KEY, value: IterableAutoRegistrationTests.apiKey)])
+                networkSession.callback = {(_, _, _) in
+                    // second call back is for disable when we set new user id
+                    TestUtils.validate(request: networkSession.request!, requestType: .post, apiEndPoint: .ITBL_ENDPOINT_API, path: .ITBL_PATH_DISABLE_DEVICE, queryParams: [(name: AnyHashable.ITBL_KEY_API_KEY, value: IterableAutoRegistrationTests.apiKey)])
+                    let body = networkSession.getRequestBody() as! [String : Any]
+                    TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_TOKEN, andValue: (token as NSData).iteHexadecimalString(), inDictionary: body)
+                    TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_USER_ID, andValue: "userId1", inDictionary: body)
+                    expectation2.fulfill()
+                }
+                IterableAPI.userId = "userId2"
             }
-            IterableAPI.userId = "userId2"
         }
         IterableAPI.register(token: token)
 
         // only wait for small time, supposed to error out
-        wait(for: [expectation1, expectation2, expectation3], timeout: 1.0)
+        wait(for: [expectation0, expectation1, expectation2, expectation3], timeout: 1.0)
     }
 
     func testDoNotCallDisableOrEnableWhenAutoPushIsOff() {

swift-sdk/Internal/IterableAPIInternal.swift

@@ -53,7 +53,6 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
             _userId = newValue
             _email = nil
             storeEmailAndUserId()
-            createUserForUserId(onSuccess: IterableAPIInternal.defaultOnSucess(identifier: "createUserForUserId"), onFailure: IterableAPIInternal.defaultOnFailure(identifier: "createUserForUserId"))
 
             enableDeviceForCurrentUser()
         }
@@ -111,7 +110,22 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
             return
         }
 
-        register(token: token, appName: appName, pushServicePlatform: config.pushPlatform, onSuccess: onSuccess, onFailure: onFailure)
+        if let userId = userId {
+            createUser(
+                withUserId: userId,
+                onSuccess:  { (_) in
+                    self.register(token: token, appName: appName, pushServicePlatform: self.config.pushPlatform, onSuccess: onSuccess, onFailure: onFailure)
+            },
+                onFailure: {(errorMessage, _) in
+                    if let errorMessage = errorMessage {
+                        ITBError("Could not create user: \(errorMessage)")
+                    } else {
+                        ITBError()
+                    }
+            })
+        } else {
+            register(token: token, appName: appName, pushServicePlatform: config.pushPlatform, onSuccess: onSuccess, onFailure: onFailure)
+        }
     }
 
     private func register(token: Data, appName: String, pushServicePlatform: PushServicePlatform, onSuccess: OnSuccessHandler?, onFailure: OnFailureHandler?) {
@@ -221,14 +235,8 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
                         onFailure: onFailure)
         }
     }
-    
-    func createUserForUserId(onSuccess: OnSuccessHandler?, onFailure: OnFailureHandler?) {
-        guard userId != nil else {
-            ITBError("UserId is nil")
-            onFailure?("UserId is nil", nil)
-            return
-        }
-        
+
+    func createUser(withUserId userId: String, onSuccess: OnSuccessHandler?, onFailure: OnFailureHandler?) {
         var args = [AnyHashable : Any]()
         args[.ITBL_KEY_USER_ID] = userId