fix vuid

Author: muzahidul-opti

Sources/ODP/OdpEventManager.swift

@@ -58,11 +58,8 @@ open class OdpEventManager {
                   data: [:])
     }
 
-    func identifyUser(vuid: String?, userId: String?) {
-        var identifiers = [String: String]()
-        if let _vuid = vuid, VuidManager.isVuid(_vuid) {
-            identifiers[Constants.ODP.keyForVuid] = _vuid
-        }
+    func identifyUser(vuid: String, userId: String?) {
+        var identifiers = [Constants.ODP.keyForVuid: vuid]
         if let userId = userId {
             identifiers[Constants.ODP.keyForUserId] = userId
         }
@@ -72,7 +69,7 @@ open class OdpEventManager {
                   identifiers: identifiers,
                   data: [:])
     }
-    
+
     func sendEvent(type: String, action: String, identifiers: [String: String], data: [String: Any?]) {
         let event = OdpEvent(type: type,
                              action: action,

Sources/ODP/OdpManager.swift

@@ -91,14 +91,16 @@ public class OdpManager {
             logger.d("ODP identify event is not dispatched (ODP not integrated).")
             return
         }
-
+        
+        var vuid = VuidManager.shared.vuid
+        var fsUserId: String? = userId
         if VuidManager.isVuid(userId) {
             // overwrite if userId is vuid (when userContext is created with vuid)
-            eventManager.identifyUser(vuid: userId, userId: nil)
-        } else {
-            eventManager.identifyUser(vuid: self.vuid, userId: userId)
+            vuid = userId
+            fsUserId = nil
         }
 
+        eventManager.identifyUser(vuid: vuid, userId: fsUserId)
     }
 
     /// Send an event to the ODP server.

Sources/Optimizely+Decide/OptimizelyClient+Decide.swift

@@ -36,10 +36,10 @@ extension OptimizelyClient {
     /// - Parameter attributes: A map of attribute names to current user attribute values.
     /// - Returns: An OptimizelyUserContext associated with this OptimizelyClient
     public func createUserContext(attributes: [String: Any]? = nil) -> OptimizelyUserContext? {
-//        guard enableVuid else {
-//            logger.e("Vuid is not enabled or invalid VUID. User context not created.")
-//            return nil
-//        }
+        guard let vuid = self.vuid else {
+            logger.e("Vuid is not enabled or invalid VUID. User context not created.")
+            return nil
+        }
         return OptimizelyUserContext(optimizely: self, userId: vuid, attributes: attributes)
     }
 

Sources/Optimizely/OptimizelyClient.swift

@@ -118,11 +118,11 @@ open class OptimizelyClient: NSObject {
         self.decisionService = HandlerRegistryService.shared.injectDecisionService(sdkKey: self.sdkKey)
         self.notificationCenter = HandlerRegistryService.shared.injectNotificationCenter(sdkKey: self.sdkKey)
 
-        if self.enableVuid {
+        if vuidManager.enable {
             try? sendOdpEvent(type: Constants.ODP.eventType,
                               action: "client_initialized",
                               identifiers: [
-                                Constants.ODP.keyForVuid: self.vuid
+                                Constants.ODP.keyForVuid: vuidManager.vuid
                               ],
                               data: [:])
 
@@ -984,7 +984,7 @@ extension OptimizelyClient {
     }
 
     /// the device vuid (read only)
-    public var vuid: String {
+    public var vuid: String? {
         return self.vuidManager.vuid
     }