Improve code

Author: cy-moi

packages/core/src/domain/session/sessionState.ts

@@ -23,13 +23,8 @@ export function getExpiredSessionState(
   const expiredSessionState: SessionState = {
     isExpired: EXPIRED,
   }
-  if (!hasConsent) {
-    return expiredSessionState
-  }
-  if (configuration.trackAnonymousUser) {
-    if (previousSessionState?.anonymousId) {
-      expiredSessionState.anonymousId = previousSessionState?.anonymousId
-    }
+  if (hasConsent && configuration.trackAnonymousUser && previousSessionState?.anonymousId) {
+    expiredSessionState.anonymousId = previousSessionState?.anonymousId
   }
   return expiredSessionState
 }

packages/core/src/domain/session/sessionStore.ts

@@ -156,7 +156,7 @@ export function startSessionStore<TrackingType extends string>(
     }
     if (hasSessionInCache()) {
       if (isSessionInCacheOutdated(sessionState)) {
-        expireSessionInCache(sessionState)
+        expireSessionInCache()
       } else {
         sessionStateUpdateObservable.notify({ previousState: sessionCache, newState: sessionState })
         sessionCache = sessionState
@@ -170,9 +170,7 @@ export function startSessionStore<TrackingType extends string>(
       {
         process: (sessionState) => {
           if (isSessionInNotStartedState(sessionState)) {
-            if (!sessionState.anonymousId) {
-              sessionState.anonymousId = generateUUID()
-            }
+            sessionState.anonymousId = generateUUID()
             return getExpiredSessionState(sessionState, configuration)
           }
         },
@@ -206,8 +204,8 @@ export function startSessionStore<TrackingType extends string>(
     return sessionCache.id !== sessionState.id || sessionCache[productKey] !== sessionState[productKey]
   }
 
-  function expireSessionInCache(sessionState: SessionState) {
-    sessionCache = getExpiredSessionState(sessionState, configuration)
+  function expireSessionInCache() {
+    sessionCache = getExpiredSessionState(sessionCache, configuration)
     expireObservable.notify()
   }
 
@@ -236,9 +234,11 @@ export function startSessionStore<TrackingType extends string>(
     restartSession: startSession,
     expire: (hasConsent?: boolean) => {
       cancelExpandOrRenewSession()
-      const expiredSessionState = getExpiredSessionState(sessionCache, configuration, hasConsent)
-      sessionStoreStrategy.expireSession(expiredSessionState)
-      synchronizeSession(expiredSessionState)
+      if (hasConsent === false && sessionCache) {
+        delete sessionCache.anonymousId
+      }
+      sessionStoreStrategy.expireSession(sessionCache)
+      synchronizeSession(getExpiredSessionState(sessionCache, configuration))
     },
     stop: () => {
       clearInterval(watchSessionTimeoutId)

packages/logs/src/domain/logsSessionManager.ts

@@ -35,7 +35,7 @@ export function startLogsSessionManager(
       return session && session.trackingType === LoggerTrackingType.TRACKED
         ? {
             id: session.id,
-            anonymousId: trackingConsentState.isGranted() ? session.anonymousId : undefined,
+            anonymousId: session.anonymousId,
           }
         : undefined
     },

test/e2e/scenario/rum/sessions.scenario.ts

@@ -81,6 +81,18 @@ test.describe('rum sessions', () => {
 
         expect(true).toBeTruthy()
       })
+
+    createTest('removes anonymous id when tracking consent is withdrawn')
+      .withRum()
+      .run(async ({ browserContext, page }) => {
+        expect((await findSessionCookie(browserContext))?.aid).toBeDefined()
+
+        await page.evaluate(() => {
+          window.DD_RUM!.setTrackingConsent('not-granted')
+        })
+
+        expect((await findSessionCookie(browserContext))?.aid).toBeUndefined()
+      })
   })
 
   test.describe('manual session expiration', () => {