WIP: Update odpmanager and client

Author: muzahidul-opti

Sources/ODP/OdpManager.swift

@@ -18,18 +18,13 @@ import Foundation
 
 public class OdpManager {
     var enabled: Bool
-//    var enableVuid: Bool
-    var vuidManager: OdpVuidManager
-
     var odpConfig: OdpConfig!
     var segmentManager: OdpSegmentManager!
     var eventManager: OdpEventManager!
 
     let logger = OPTLoggerFactory.getLogger()
 
-//    var vuid: String {
-//        return vuidManager.vuid
-//    }
+    var vuid: String?
 
     /// OdpManager init
     /// - Parameters:
@@ -43,7 +38,6 @@ public class OdpManager {
     ///   - eventManager: ODPEventManager
     public init(sdkKey: String,
                 disable: Bool,
-                enableVuid: Bool,
                 cacheSize: Int,
                 cacheTimeoutInSecs: Int,
                 timeoutForSegmentFetchInSecs: Int? = nil,
@@ -52,8 +46,6 @@ public class OdpManager {
                 eventManager: OdpEventManager? = nil) {
 
         self.enabled = !disable
-//        self.enableVuid = enableVuid
-        self.vuidManager = OdpVuidManager(enabled: enableVuid)
 
         guard enabled else {
             logger.i(.odpNotEnabled)
@@ -68,10 +60,6 @@ public class OdpManager {
         self.odpConfig = OdpConfig()
         self.segmentManager.odpConfig = odpConfig
         self.eventManager.odpConfig = odpConfig
-        
-//        if enableVuid {
-//            self.eventManager.registerVUID(vuid: vuidManager.vuid)
-//        }
     }
 
     func fetchQualifiedSegments(userId: String,
@@ -130,9 +118,9 @@ public class OdpManager {
         let typeUpdated = (type ?? "").isEmpty ? Constants.ODP.eventType : type!
 
         var identifiersUpdated = identifiers
-        
-        if identifiers[Constants.ODP.keyForVuid] == nil {
-            identifiersUpdated[Constants.ODP.keyForVuid] = vuidManager.vuid
+        let _vuid = vuid ?? ""
+        if identifiers[Constants.ODP.keyForVuid] == nil, OdpVuidManager.isVuid(_vuid) {
+            identifiersUpdated[Constants.ODP.keyForVuid] = _vuid
         }
 
         // replace aliases (fs-user-id, FS_USER_ID, FS-USER-ID) with "fs_user_id".

Sources/Optimizely/OptimizelyClient.swift

@@ -95,7 +95,6 @@ open class OptimizelyClient: NSObject {
 
         self.odpManager = odpManager ?? OdpManager(sdkKey: sdkKey,
                                                    disable: sdkSettings.disableOdp,
-                                                   enableVuid: sdkSettings.enableVuid,
                                                    cacheSize: sdkSettings.segmentsCacheSize,
                                                    cacheTimeoutInSecs: sdkSettings.segmentsCacheTimeoutInSecs,
                                                    timeoutForSegmentFetchInSecs: sdkSettings.timeoutForSegmentFetchInSecs,
@@ -120,11 +119,26 @@ open class OptimizelyClient: NSObject {
 
         self.vuidManager = OdpVuidManager(enabled: sdkSettings.enableVuid)
         if self.vuidManager.enabled {
-            self.odpManager.eventManager.registerVUID(vuid: self.vuidManager.vuid)
+            self.odpManager.vuid = vuidManager.vuid
+            // Cushes due to odpManager didn't initialize yet.
+           // self.odpManager.eventManager.registerVUID(vuid: vuidManager.vuid)
+        }
+        
+        // FIXME: Need a better solution
+        DispatchQueue.global().asyncAfter(deadline: .now() + 0.1) {
+            self.registerVUID()
         }
+        
+        
         logger.d("SDK Version: \(version)")
     }
 
+    private func registerVUID() {
+        if self.vuidManager.enabled {
+            self.odpManager.eventManager.registerVUID(vuid: self.vuidManager.vuid)
+        }
+    }
+    
     /// Start Optimizely SDK (Asynchronous)
     ///
     /// If an updated datafile is available in the server, it's downloaded and the SDK is configured with