Merge pull request #55 from Iterable/feature/mob-94-current-user-id

[MOB-94] - Only set new email on updateEmail if it was using email.

Author: tapashmajumder

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

@@ -177,7 +177,8 @@ class IterableAPITests: XCTestCase {
                                     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)
+                                    XCTAssertEqual(IterableAPI.userId, currentUserId)
+                                    XCTAssertNil(IterableAPI.email)
                                     expectation.fulfill()
         },
                                 onFailure: {(reason, _) in

swift-sdk/Internal/IterableAPIInternal.swift

@@ -235,7 +235,10 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
         if let request = createPostRequest(forPath: .ITBL_PATH_UPDATE_EMAIL, withBody: args) {
             sendRequest(request,
                         onSuccess: { data in
-                            self.email = newEmail
+                            if let _ = self.email {
+                                // we change the email only if we were using email before
+                                self.email = newEmail
+                            }
                             onSuccess?(data)
                         },
                         onFailure: onFailure)