refactor: improve validation

rudderlabs · Nov 21, 2024 · 4405c77 · 4405c77
1 parent 15dc64c
commit 4405c77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/analytics-js/src/components/core/Analytics.ts b/packages/analytics-js/src/components/core/Analytics.ts
@@ -18,7 +18,6 @@ import type {
   LoadOptions,
 } from '@rudderstack/analytics-js-common/types/LoadOptions';
 import type { ApiCallback } from '@rudderstack/analytics-js-common/types/EventApi';
-import { isObjectAndNotNull } from '@rudderstack/analytics-js-common/utilities/object';
 import {
   ANALYTICS_CORE,
   READY_API,

diff --git a/packages/analytics-js/src/components/userSessionManager/UserSessionManager.ts b/packages/analytics-js/src/components/userSessionManager/UserSessionManager.ts
@@ -468,7 +468,11 @@ class UserSessionManager implements IUserSessionManager {
    * 3. generateUUID: A new unique id is generated and assigned.
    */
   setAnonymousId(anonymousId?: string, rudderAmpLinkerParam?: string) {
-    let finalAnonymousId: string | undefined | null = anonymousId;
+    let finalAnonymousId: string | undefined = anonymousId;
+    if (!isString(anonymousId) || !finalAnonymousId) {
+      finalAnonymousId = undefined;
+    }
+
     if (this.isPersistenceEnabledForStorageEntry('anonymousId')) {
       if (!finalAnonymousId && rudderAmpLinkerParam) {
         const linkerPluginsResult = this.pluginsManager?.invokeSingle(
@@ -668,7 +672,7 @@ class UserSessionManager implements IUserSessionManager {
       session.groupTraits.value = DEFAULT_USER_SESSION_VALUES.groupTraits;
       session.authToken.value = DEFAULT_USER_SESSION_VALUES.authToken;
 
-      if (resetAnonymousId) {
+      if (resetAnonymousId === true) {
         // This will generate a new anonymous ID
         this.setAnonymousId();
       }