[WIP] Refractored vuid logic

Author: muzahidul-opti

Sources/ODP/OdpManager.swift

@@ -68,10 +68,6 @@ public class OdpManager {
         self.odpConfig = OdpConfig()
         self.segmentManager.odpConfig = odpConfig
         self.eventManager.odpConfig = odpConfig
-        if enableVuid {
-            self.eventManager.registerVUID(vuid: self.vuidManager.vuid)
-        }
-        
     }
 
     func fetchQualifiedSegments(userId: String,
@@ -102,17 +98,14 @@ public class OdpManager {
             return
         }
 
-        if enableVuid {
-            var vuid = vuidManager.vuid
-            var fsUserId: String? = userId
-            if OdpVuidManager.isVuid(userId) {
-                // overwrite if userId is vuid (when userContext is created with vuid)
-                vuid = userId
-                fsUserId = nil
-            }
-            eventManager.identifyUser(vuid: vuid, userId: fsUserId)
+        var vuid = vuidManager.vuid
+        var fsUserId: String? = userId
+        if OdpVuidManager.isVuid(userId) {
+            // overwrite if userId is vuid (when userContext is created with vuid)
+            vuid = userId
+            fsUserId = nil
         }
-        
+        eventManager.identifyUser(vuid: vuid, userId: fsUserId)
     }
 
     /// Send an event to the ODP server.
@@ -134,19 +127,11 @@ public class OdpManager {
 
         var identifiersUpdated = identifiers
 
-        if enableVuid {
-            // add vuid to all events by default
-            if identifiers[Constants.ODP.keyForVuid] == nil {
-                identifiersUpdated[Constants.ODP.keyForVuid] = vuidManager.vuid
-            }
-        } else {
-            // remove vuid events
-            identifiersUpdated[Constants.ODP.keyForVuid] = nil
+        if identifiers[Constants.ODP.keyForVuid] == nil {
+            identifiersUpdated[Constants.ODP.keyForVuid] = vuidManager.vuid
         }
 
-        
         // replace aliases (fs-user-id, FS_USER_ID, FS-USER-ID) with "fs_user_id".
-        
         for (idKey, idValue) in identifiersUpdated {
             if idKey == Constants.ODP.keyForUserId { break }
 

Sources/ODP/OdpVuidManager.swift

@@ -18,10 +18,10 @@ import Foundation
 
 class OdpVuidManager {
     private var _vuid: String = ""
-    var enabled: Bool
+    private(set) var enabled: Bool
     let logger = OPTLoggerFactory.getLogger()
 
-    init(enabled: Bool) {
+    init(enabled: Bool = false) {
         self.enabled = enabled
         if enabled {
             self._vuid = load()
@@ -52,6 +52,7 @@ extension OdpVuidManager {
         if enabled {
             return _vuid
         } else {
+            logger.w("VUID is not enabled.")
             return ""
         }
     }

Sources/Optimizely+Decide/OptimizelyClient+Decide.swift

@@ -36,8 +36,8 @@ 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 sdkSettings.enableVuid else {
-            logger.e("Vuid is not enabled. User context creation failed.")
+        guard enableVuid, OdpVuidManager.isVuid(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

@@ -99,6 +99,10 @@ open class OptimizelyClient: NSObject {
                                                    cacheTimeoutInSecs: sdkSettings.segmentsCacheTimeoutInSecs,
                                                    timeoutForSegmentFetchInSecs: sdkSettings.timeoutForSegmentFetchInSecs,
                                                    timeoutForEventDispatchInSecs: sdkSettings.timeoutForOdpEventInSecs)
+        
+        if self.odpManager.enableVuid {
+            self.odpManager.eventManager.registerVUID(vuid: self.odpManager.vuid)
+        }
         let userProfileService = userProfileService ?? DefaultUserProfileService()
         let logger = logger ?? DefaultLogger()
         type(of: logger).logLevel = defaultLogLevel ?? .info
@@ -976,6 +980,10 @@ extension OptimizelyClient {
         return odpManager.vuid
     }
 
+    public var enableVuid: Bool {
+        return odpManager.enableVuid
+    }
+    
     func identifyUserToOdp(userId: String) {
         odpManager.identifyUser(userId: userId)
     }