WIP: VuidManager api renamed. Ignore case comparision added

Author: muzahidul-opti

Sources/Optimizely/OptimizelyClient.swift

@@ -93,7 +93,7 @@ open class OptimizelyClient: NSObject {
 
         super.init()
         self.vuidManager = VuidManager.shared
-        self.vuidManager.initialize(enabled: self.sdkSettings.enableVuid)
+        self.vuidManager.configure(enable: self.sdkSettings.enableVuid)
         self.odpManager = odpManager ?? OdpManager(sdkKey: sdkKey,
                                                    disable: sdkSettings.disableOdp,
                                                    vuid: vuidManager.vuid,
@@ -980,7 +980,7 @@ extension OptimizelyClient {
     }
 
     public var enableVuid: Bool {
-        return self.vuidManager.enabled
+        return self.vuidManager.enable
     }
 
     func identifyUserToOdp(userId: String) {

Sources/Optimizely/VuidManager.swift

@@ -18,18 +18,19 @@ import Foundation
 
 class VuidManager {
     private var _vuid: String = ""
-    private(set) var enabled: Bool = false
+    private(set) var enable: Bool = false
     let logger = OPTLoggerFactory.getLogger()
 
     // a single vuid should be shared for all SDK instances
     static let shared = VuidManager()
 
-    func initialize(enabled: Bool) {
-        self.enabled = enabled
-        if enabled {
+    func configure(enable: Bool) {
+        self.enable = enable
+        if enable {
             self._vuid = load()
         } else {
             self.remove()
+            self._vuid = ""
         }
     }
 
@@ -43,7 +44,7 @@ class VuidManager {
     }
 
     static func isVuid(_ visitorId: String) -> Bool {
-        return visitorId.starts(with: "vuid_")
+        return visitorId.lowercased().starts(with: "vuid_")
     }
 
 }
@@ -52,7 +53,7 @@ class VuidManager {
 
 extension VuidManager {
     var vuid: String? {
-        if enabled {
+        if self.enable {
             return _vuid
         } else {
             logger.w("VUID is not enabled.")

Tests/OptimizelyTests-Common/VuidManagerTests.swift

@@ -21,7 +21,7 @@ class VuidManagerTests: XCTestCase {
 
 
     func testNewVuid() {
-        manager.initialize(enabled: true)
+        manager.configure(enable: true)
 
         let vuid = VuidManager.newVuid
 
@@ -30,16 +30,23 @@ class VuidManagerTests: XCTestCase {
     }
 
     func testIsVuid() {
-        manager.initialize(enabled: true)
+        manager.configure(enable: true)
         XCTAssertTrue(VuidManager.isVuid("vuid_123"))
         XCTAssertFalse(VuidManager.isVuid("vuid-123"))
         XCTAssertFalse(VuidManager.isVuid("123"))
     }
 
+    func testIsVuidIgnoreCase() {
+        manager.configure(enable: true)
+        XCTAssertTrue(VuidManager.isVuid("VUID_123"))
+        XCTAssertFalse(VuidManager.isVuid("VUID-123"))
+        XCTAssertFalse(VuidManager.isVuid("123"))
+    }
+    
     func testAutoSaveAndLoad() {
         UserDefaults.standard.removeObject(forKey: "optimizely-vuid")
 
-        manager.initialize(enabled: true)
+        manager.configure(enable: true)
         let vuid1 = manager.vuid
 
         let vuid2 = manager.vuid
@@ -50,19 +57,19 @@ class VuidManagerTests: XCTestCase {
 
         UserDefaults.standard.removeObject(forKey: "optimizely-vuid")
 
-        manager.initialize(enabled: true)
+        manager.configure(enable: true)
         let vuid3 = manager.vuid
 
         XCTAssertTrue(vuid1 != vuid3)
     }
 
     func testRemoveOldVuid() {
-        manager.initialize(enabled: true)
+        manager.configure(enable: true)
         let cahcedVuid1 = UserDefaults.standard.string(forKey: "optimizely-vuid")
         XCTAssertNotNil(cahcedVuid1)
         XCTAssertTrue(cahcedVuid1 == manager.vuid)
 
-        manager.initialize(enabled: false)
+        manager.configure(enable: false)
         let cahcedVuid2 = UserDefaults.standard.string(forKey: "optimizely-vuid")
         XCTAssertNil(cahcedVuid2)