fix: code to pass tests

Author: mikechu-optimizely

lib/core/odp/odp_manager.ts

@@ -27,6 +27,7 @@ import { OptimizelySegmentOption } from './optimizely_segment_option';
 import { invalidOdpDataFound } from './odp_utils';
 import { OdpEvent } from './odp_event';
 import { resolvablePromise, ResolvablePromise } from '../../utils/promise/resolvablePromise';
+import { OdpOptions } from '../../shared_types';
 
 /**
  * Manager for handling internal all business logic related to
@@ -97,22 +98,29 @@ export abstract class OdpManager implements IOdpManager {
    */
   odpIntegrationConfig?: OdpIntegrationConfig;
 
+  /**
+   * ODP initialization options
+   */
+  protected odpOptions?: OdpOptions;
+
   // TODO: Consider accepting logger as a parameter and initializing it in constructor instead
   constructor({
     odpIntegrationConfig,
     segmentManager,
     eventManager,
     logger,
+    odpOptions,
   }: {
     odpIntegrationConfig?: OdpIntegrationConfig;
     segmentManager: IOdpSegmentManager;
     eventManager: IOdpEventManager;
     logger: LogHandler;
+    odpOptions?: OdpOptions;
   }) {
     this.segmentManager = segmentManager;
     this.eventManager = eventManager;
     this.logger = logger;
-
+    this.odpOptions = odpOptions;
     this.configPromise = resolvablePromise();
 
     const readinessDependencies: PromiseLike<unknown>[] = [this.configPromise];

lib/plugins/odp_manager/index.browser.ts

@@ -51,14 +51,14 @@ interface BrowserOdpManagerConfig {
 // Client-side Browser Plugin for ODP Manager
 export class BrowserOdpManager extends OdpManager {
   static cache = new BrowserAsyncStorageCache();
-  vuid?: string;
-  private static shouldUseVuid = false;
+  vuid?: string = "";
 
   constructor(options: {
     odpIntegrationConfig?: OdpIntegrationConfig;
     segmentManager: IOdpSegmentManager;
     eventManager: IOdpEventManager;
     logger: LogHandler;
+    odpOptions?: OdpOptions;
   }) {
     super(options);
   }
@@ -129,13 +129,12 @@ export class BrowserOdpManager extends OdpManager {
       });
     }
 
-    this.shouldUseVuid = odpOptions?.enableVuid || false;
-
     return new BrowserOdpManager({
       odpIntegrationConfig,
       segmentManager,
       eventManager,
       logger,
+      odpOptions,
     });
   }
 
@@ -144,14 +143,7 @@ export class BrowserOdpManager extends OdpManager {
    * accesses or creates new VUID from Browser cache
    */
   protected async initializeVuid(): Promise<void> {
-    const vuidManager = await VuidManager.instance(BrowserOdpManager.cache);
-
-    if (!this.isVuidEnabled()) {
-      await vuidManager.remove(BrowserOdpManager.cache);
-      // assign default empty string VUID from VuidManager instead of 
-      // early return here.
-    }
-
+    const vuidManager = await VuidManager.instance(BrowserOdpManager.cache, this.odpOptions);
     this.vuid = vuidManager.vuid;
   }
 
@@ -197,7 +189,7 @@ export class BrowserOdpManager extends OdpManager {
   }
 
   isVuidEnabled(): boolean {
-    return BrowserOdpManager.shouldUseVuid;
+    return this.odpOptions?.enableVuid || false;
   }
 
   getVuid(): string | undefined {

lib/plugins/vuid_manager/index.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { OdpOptions } from '../../shared_types';
 import { uuid } from '../../utils/fns';
 import PersistentKeyValueCache from '../key_value_cache/persistentKeyValueCache';
 
@@ -43,7 +44,7 @@ export class VuidManager implements IVuidManager {
    * Current VUID value being used
    * @private
    */
-  private _vuid: string;
+  private _vuid = '';
 
   /**
    * Get the current VUID value being used
@@ -52,9 +53,7 @@ export class VuidManager implements IVuidManager {
     return this._vuid;
   }
 
-  private constructor() {
-    this._vuid = '';
-  }
+  private constructor() { }
 
   /**
    * Instance of the VUID Manager
@@ -67,11 +66,16 @@ export class VuidManager implements IVuidManager {
    * @param cache Caching mechanism to use for persisting the VUID outside working memory   *
    * @returns An instance of VuidManager
    */
-  static async instance(cache: PersistentKeyValueCache): Promise<VuidManager> {
+  static async instance(cache: PersistentKeyValueCache, options?: OdpOptions): Promise<VuidManager> {
     if (!this._instance) {
       this._instance = new VuidManager();
     }
 
+    if (!options?.enableVuid) {
+      cache.remove(this._instance._keyForVuid);
+      return this._instance;
+    }
+
     if (!this._instance._vuid) {
       await this._instance.load(cache);
     }
@@ -123,14 +127,6 @@ export class VuidManager implements IVuidManager {
     await cache.set(this._keyForVuid, vuid);
   }
 
-  /**
-   * Removes the VUID from the cache
-   * @param cache Caching mechanism to use for persisting the VUID outside working memory
-   */
-  async remove(cache: PersistentKeyValueCache): Promise<void> {
-    await cache.remove(this._keyForVuid);
-  }
-
   /**
    * Validates the format of a Visitor Unique Identifier
    * @param vuid VistorId to check