Cherry pick fix for update email using user id from master.

Author: tapashmajumder

Tests/swift-sdk-swift-tests/IterableAPITests.swift

@@ -186,6 +186,40 @@ class IterableAPITests: XCTestCase {
 
         wait(for: [expectation], timeout: testExpectationTimeout)
     }
+
+    func testUpdateEmailWithUserId() {
+        let expectation = XCTestExpectation(description: "testUpdateEmailWithUserId")
+        
+        let currentUserId = IterableUtil.generateUUID()
+        let newEmail = "[email protected]"
+        let networkSession = MockNetworkSession(statusCode: 200)
+        IterableAPI.initialize(apiKey: IterableAPITests.apiKey, networkSession: networkSession)
+        IterableAPI.userId = currentUserId
+        IterableAPI.updateEmail(newEmail,
+                                onSuccess: {json in
+                                    TestUtils.validate(request: networkSession.request!,
+                                                       requestType: .post,
+                                                       apiEndPoint: .ITBL_ENDPOINT_API,
+                                                       path: .ITBL_PATH_UPDATE_EMAIL,
+                                                       queryParams: [(name: "api_key", value: IterableAPITests.apiKey)])
+                                    let body = networkSession.getRequestBody()
+                                    TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_NEW_EMAIL, andValue: newEmail, inDictionary: body)
+                                    TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_CURRENT_USER_ID, andValue: currentUserId, inDictionary: body)
+                                    XCTAssertEqual(IterableAPI.email, newEmail)
+                                    expectation.fulfill()
+        },
+                                onFailure: {(reason, _) in
+                                    expectation.fulfill()
+                                    if let reason = reason {
+                                        XCTFail("encountered error: \(reason)")
+                                    } else {
+                                        XCTFail("encountered error")
+                                    }
+        })
+        
+        wait(for: [expectation], timeout: testExpectationTimeout)
+    }
+
 
     func testRegisterTokenNilAppName() {
         let expectation = XCTestExpectation(description: "testRegisterToken")

swift-sdk/ITBConsts.swift

@@ -39,6 +39,7 @@ public extension AnyHashable {
     static let ITBL_KEY_CAMPAIGN_ID = "campaignId"
     static let ITBL_KEY_COUNT = "count"
     static let ITBL_KEY_CURRENT_EMAIL = "currentEmail"
+    static let ITBL_KEY_CURRENT_USER_ID = "currentUserId"
     static let ITBL_KEY_DATA_FIELDS = "dataFields"
     static let ITBL_KEY_DEVICE = "device"
     static let ITBL_KEY_EMAIL = "email"

swift-sdk/Internal/IterableAPIInternal.swift

@@ -208,16 +208,20 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
     }
 
     func updateEmail(_ newEmail: String, onSuccess: OnSuccessHandler?, onFailure: OnFailureHandler?) {
-        guard let email = email else {
-            onFailure?("updateEmail should not be called with a userId. Init SDK with email instead of userId.", nil)
-            return
-        }
-        
-        let args: [String : Any] = [
-            AnyHashable.ITBL_KEY_CURRENT_EMAIL: email,
+        var args: [String : Any] = [
             AnyHashable.ITBL_KEY_NEW_EMAIL: newEmail
         ]
 
+        if let userId = userId {
+            args[AnyHashable.ITBL_KEY_CURRENT_USER_ID] = userId
+        } else if let email = email {
+            args[AnyHashable.ITBL_KEY_CURRENT_EMAIL] = email
+        } else {
+            ITBError("Both email and userId are nil")
+            onFailure?("Both email and userId are nil", nil)
+            return
+        }
+
         if let request = createPostRequest(forPath: .ITBL_PATH_UPDATE_EMAIL, withBody: args) {
             sendRequest(request,
                         onSuccess: { data in