WIP: Make vuid optional to identifyUser method

Author: muzahidul-opti

Sources/ODP/OdpEventManager.swift

@@ -58,8 +58,11 @@ open class OdpEventManager {
                   data: [:])
     }
 
-    func identifyUser(vuid: String, userId: String?) {
-        var identifiers = [Constants.ODP.keyForVuid: vuid]
+    func identifyUser(vuid: String?, userId: String?) {
+        var identifiers = [String: String]()
+        if let _vuid = vuid {
+            identifiers[Constants.ODP.keyForVuid] = _vuid
+        }
         if let userId = userId {
             identifiers[Constants.ODP.keyForUserId] = userId
         }

Sources/ODP/OdpManager.swift

@@ -97,8 +97,8 @@ public class OdpManager {
         if VuidManager.isVuid(userId) {
             // overwrite if userId is vuid (when userContext is created with vuid)
             eventManager.identifyUser(vuid: userId, userId: nil)
-        } else if let _vuid = vuid {
-            eventManager.identifyUser(vuid: _vuid, userId: userId)
+        } else {
+            eventManager.identifyUser(vuid: self.vuid, userId: userId)
         }
 
     }

Tests/OptimizelyTests-Common/OdpManagerTests.swift

@@ -34,7 +34,6 @@ class OdpManagerTests: XCTestCase {
                              cacheTimeoutInSecs: cacheTimeout,
                              segmentManager: segmentManager,
                              eventManager: eventManager)
-        manager.vuid = nil
     }
 
     override func tearDown() {
@@ -139,14 +138,14 @@ class OdpManagerTests: XCTestCase {
         manager.updateOdpConfig(apiKey: "key-1", apiHost: "host-1", segmentsToCheck: [])
         manager.identifyUser(userId: "user-1")
 
-        XCTAssert(OdpVuidManager.isVuid(eventManager.receivedIdentifyVuid))
+        XCTAssert(VuidManager.isVuid(eventManager.receivedIdentifyVuid))
         XCTAssertEqual(eventManager.receivedIdentifyUserId, "user-1")
     }
 
     func testIdentifyUser_odpIntegrated_vuidAsUserId() {
         manager.updateOdpConfig(apiKey: "key-1", apiHost: "host-1", segmentsToCheck: [])
 
-        let vuidAsUserId = OdpVuidManager.newVuid
+        let vuidAsUserId = VuidManager.newVuid
         manager.identifyUser(userId: vuidAsUserId)
 
         XCTAssertEqual(eventManager.receivedIdentifyVuid, vuidAsUserId)
@@ -389,7 +388,7 @@ class OdpManagerTests: XCTestCase {
             self.receivedRegisterVuid = vuid
         }
 
-        override func identifyUser(vuid: String, userId: String?) {
+        override func identifyUser(vuid: String?, userId: String?) {
             self.receivedIdentifyVuid = vuid
             self.receivedIdentifyUserId = userId
         }

Tests/OptimizelyTests-Common/OptimizelyUserContextTests_ODP_2.swift

@@ -36,6 +36,7 @@ class OptimizelyUserContextTests_ODP_2: XCTestCase {
         let odpEventApiManager = MockOdpEventApiManager()
         optimizely.odpManager = OdpManager(sdkKey: sdkKey,
                                     disable: false,
+                                    vuid: "vuid_123",
                                     cacheSize: 10,
                                     cacheTimeoutInSecs: 10,
                                     eventManager: OdpEventManager(sdkKey: sdkKey,