WIP: OdpVuidManager renamed as VuidManager

Author: muzahidul-opti

OptimizelySwiftSDK.xcodeproj/project.pbxproj

@@ -61,7 +61,7 @@ public class OdpManager {
         self.odpConfig = OdpConfig()
         self.segmentManager.odpConfig = odpConfig
         self.eventManager.odpConfig = odpConfig
-        if let vuid = vuid, OdpVuidManager.isVuid(vuid) {
+        if let vuid = vuid, VuidManager.isVuid(vuid) {
             self.eventManager.sendInitializedEvent(vuid: vuid)
         }
     }
@@ -74,7 +74,7 @@ public class OdpManager {
             return
         }
 
-        let userKey = OdpVuidManager.isVuid(userId) ? Constants.ODP.keyForVuid : Constants.ODP.keyForUserId
+        let userKey = VuidManager.isVuid(userId) ? Constants.ODP.keyForVuid : Constants.ODP.keyForUserId
         let userValue = userId
 
         segmentManager.fetchQualifiedSegments(userKey: userKey,
@@ -94,7 +94,7 @@ public class OdpManager {
             return
         }
 
-        if OdpVuidManager.isVuid(userId) {
+        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 {

Sources/ODP/OdpManager.swift

@@ -60,7 +60,7 @@ open class OptimizelyClient: NSObject {
     var decisionService: OPTDecisionService!
     public var notificationCenter: OPTNotificationCenter?
     public var odpManager: OdpManager!
-    private var vuidManager: OdpVuidManager!
+    private var vuidManager: VuidManager!
     let sdkSettings: OptimizelySdkSettings
 
     // MARK: - Public interfaces
@@ -92,7 +92,7 @@ open class OptimizelyClient: NSObject {
         self.defaultDecideOptions = defaultDecideOptions ?? []
 
         super.init()
-        self.vuidManager = OdpVuidManager.shared
+        self.vuidManager = VuidManager.shared
         self.vuidManager.intiazialize(enabled: self.sdkSettings.enableVuid)
         self.odpManager = odpManager ?? OdpManager(sdkKey: sdkKey,
                                                    disable: sdkSettings.disableOdp,

Sources/Optimizely/OptimizelyClient.swift

@@ -16,13 +16,13 @@
 
 import Foundation
 
-class OdpVuidManager {
+class VuidManager {
     private var _vuid: String = ""
     private(set) var enabled: Bool = false
     let logger = OPTLoggerFactory.getLogger()
 
     // a single vuid should be shared for all SDK instances
-    static let shared = OdpVuidManager()
+    static let shared = VuidManager()
 
     func intiazialize(enabled: Bool) {
         self.enabled = enabled
@@ -50,7 +50,7 @@ class OdpVuidManager {
 
 // MARK: - VUID Store
 
-extension OdpVuidManager {
+extension VuidManager {
     var vuid: String? {
         if enabled {
             return _vuid
@@ -69,7 +69,7 @@ extension OdpVuidManager {
             return oldVuid
         }
 
-        let vuid = OdpVuidManager.newVuid
+        let vuid = VuidManager.newVuid
         save(vuid: vuid)
         return vuid
     }

Sources/ODP/OdpVuidManager.swift renamed to Sources/Optimizely/VuidManager.swift

@@ -0,0 +1,71 @@
+//
+// Copyright 2022, Optimizely, Inc. and contributors 
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");  
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at   
+// 
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import XCTest
+
+class VuidManagerTests: XCTestCase {
+    var manager = VuidManager.shared
+    
+    
+    func testNewVuid() {
+        manager.intiazialize(enabled: true)
+        
+        let vuid = VuidManager.newVuid
+        
+        XCTAssertTrue(vuid.starts(with: "vuid_"))
+        XCTAssertEqual(vuid.count, 32)
+    }
+    
+    func testIsVuid() {
+        manager.intiazialize(enabled: true)
+        XCTAssertTrue(VuidManager.isVuid("vuid_123"))
+        XCTAssertFalse(VuidManager.isVuid("vuid-123"))
+        XCTAssertFalse(VuidManager.isVuid("123"))
+    }
+    
+    func testAutoSaveAndLoad() {
+        UserDefaults.standard.removeObject(forKey: "optimizely-vuid")
+        
+        manager.intiazialize(enabled: true)
+        let vuid1 = manager.vuid
+        
+        let vuid2 = manager.vuid
+
+        XCTAssertTrue(vuid1 == vuid2)
+        XCTAssert(VuidManager.isVuid(vuid1!))
+        XCTAssert(VuidManager.isVuid(vuid2!))
+        
+        UserDefaults.standard.removeObject(forKey: "optimizely-vuid")
+        
+        manager.intiazialize(enabled: true)
+        let vuid3 = manager.vuid
+
+        XCTAssertTrue(vuid1 != vuid3)
+    }
+    
+    func testRemoveOldVuid() {
+        manager.intiazialize(enabled: true)
+        let cahcedVuid1 = UserDefaults.standard.string(forKey: "optimizely-vuid")
+        XCTAssertNotNil(cahcedVuid1)
+        XCTAssertTrue(cahcedVuid1 == manager.vuid)
+        
+        manager.intiazialize(enabled: false)
+        let cahcedVuid2 = UserDefaults.standard.string(forKey: "optimizely-vuid")
+        XCTAssertNil(cahcedVuid2)
+        
+    }
+    
+}