Merge remote-tracking branch 'upstream/main'

Author: niuweili

packages/core/src/domain/session/storeStrategies/sessionInCookie.spec.ts

@@ -1,9 +1,8 @@
-import { resetExperimentalFeatures } from '../../../tools/experimentalFeatures'
 import { mockClock, getSessionState } from '../../../../test'
 import { setCookie, deleteCookie, getCookie, getCurrentSite } from '../../../browser/cookie'
 import type { SessionState } from '../sessionState'
 import type { Configuration } from '../../configuration'
-import { SESSION_TIME_OUT_DELAY } from '../sessionConstants'
+import { SESSION_COOKIE_EXPIRATION_DELAY, SESSION_EXPIRATION_DELAY, SESSION_TIME_OUT_DELAY } from '../sessionConstants'
 import { buildCookieOptions, selectCookieStrategy, initCookieStrategy } from './sessionInCookie'
 import type { SessionStoreStrategy } from './sessionStoreStrategy'
 import { SESSION_STORE_KEY } from './sessionStoreStrategy'
@@ -103,6 +102,56 @@ describe('session in cookie strategy', () => {
     })
   })
 })
+
+describe('session in cookie strategy when opt-in anonymous user tracking', () => {
+  const anonymousId = 'device-123'
+  const sessionState: SessionState = { id: '123', created: '0' }
+  let cookieStorageStrategy: SessionStoreStrategy
+  beforeEach(() => {
+    cookieStorageStrategy = initCookieStrategy(
+      { ...DEFAULT_INIT_CONFIGURATION, trackAnonymousUser: true } as Configuration,
+      {}
+    )
+  })
+
+  afterEach(() => {
+    deleteCookie(SESSION_STORE_KEY)
+  })
+  it('should persist with anonymous id', () => {
+    cookieStorageStrategy.persistSession({ ...sessionState, anonymousId })
+    const session = cookieStorageStrategy.retrieveSession()
+    expect(session).toEqual({ ...sessionState, anonymousId })
+    expect(getCookie(SESSION_STORE_KEY)).toBe('id=123&created=0&aid=device-123')
+  })
+
+  it('should expire with anonymous id', () => {
+    cookieStorageStrategy.expireSession({ ...sessionState, anonymousId })
+    const session = cookieStorageStrategy.retrieveSession()
+    expect(session).toEqual({ isExpired: '1', anonymousId })
+    expect(getCookie(SESSION_STORE_KEY)).toBe('isExpired=1&aid=device-123')
+  })
+
+  it('should persist for one year when opt-in', () => {
+    const cookieSetSpy = spyOnProperty(document, 'cookie', 'set')
+    const clock = mockClock()
+    cookieStorageStrategy.persistSession({ ...sessionState, anonymousId })
+    expect(cookieSetSpy.calls.argsFor(0)[0]).toContain(
+      new Date(clock.timeStamp(SESSION_COOKIE_EXPIRATION_DELAY)).toUTCString()
+    )
+    clock.cleanup()
+  })
+
+  it('should expire in one year when opt-in', () => {
+    const cookieSetSpy = spyOnProperty(document, 'cookie', 'set')
+    const clock = mockClock()
+    cookieStorageStrategy.expireSession({ ...sessionState, anonymousId })
+    expect(cookieSetSpy.calls.argsFor(0)[0]).toContain(
+      new Date(clock.timeStamp(SESSION_COOKIE_EXPIRATION_DELAY)).toUTCString()
+    )
+    clock.cleanup()
+  })
+})
+
 describe('session in cookie strategy when opt-out anonymous user tracking', () => {
   const anonymousId = 'device-123'
   const sessionState: SessionState = { id: '123', created: '0' }
@@ -113,7 +162,6 @@ describe('session in cookie strategy when opt-out anonymous user tracking', () =
   })
 
   afterEach(() => {
-    resetExperimentalFeatures()
     deleteCookie(SESSION_STORE_KEY)
   })
 
@@ -125,6 +173,12 @@ describe('session in cookie strategy when opt-out anonymous user tracking', () =
     clock.cleanup()
   })
 
+  it('should not persist with one year when opt-out', () => {
+    const cookieSetSpy = spyOnProperty(document, 'cookie', 'set')
+    cookieStorageStrategy.persistSession({ ...sessionState, anonymousId })
+    expect(cookieSetSpy.calls.argsFor(0)[0]).toContain(new Date(Date.now() + SESSION_EXPIRATION_DELAY).toUTCString())
+  })
+
   it('should not persist or expire a session with anonymous id when opt-out', () => {
     cookieStorageStrategy.persistSession({ ...sessionState, anonymousId })
     cookieStorageStrategy.expireSession({ ...sessionState, anonymousId })

packages/core/src/domain/session/storeStrategies/sessionInCookie.ts

@@ -26,29 +26,33 @@ export function initCookieStrategy(configuration: Configuration, cookieOptions:
      * This issue concerns only chromium browsers and enabling this on firefox increases cookie write failures.
      */
     isLockEnabled: isChromium(),
-    persistSession: persistSessionCookie(cookieOptions),
+    persistSession: (sessionState: SessionState) =>
+      storeSessionCookie(cookieOptions, configuration, sessionState, SESSION_EXPIRATION_DELAY),
     retrieveSession: retrieveSessionCookie,
-    expireSession: (sessionState: SessionState) => expireSessionCookie(cookieOptions, sessionState, configuration),
+    expireSession: (sessionState: SessionState) =>
+      storeSessionCookie(
+        cookieOptions,
+        configuration,
+        getExpiredSessionState(sessionState, configuration),
+        SESSION_TIME_OUT_DELAY
+      ),
   }
 
   tryOldCookiesMigration(cookieStore)
 
   return cookieStore
 }
 
-function persistSessionCookie(options: CookieOptions) {
-  return (session: SessionState) => {
-    setCookie(SESSION_STORE_KEY, toSessionString(session), SESSION_EXPIRATION_DELAY, options)
-  }
-}
-
-function expireSessionCookie(options: CookieOptions, sessionState: SessionState, configuration: Configuration) {
-  const expiredSessionState = getExpiredSessionState(sessionState, configuration)
-  // we do not extend cookie expiration date
+function storeSessionCookie(
+  options: CookieOptions,
+  configuration: Configuration,
+  sessionState: SessionState,
+  defaultTimeout: number
+) {
   setCookie(
     SESSION_STORE_KEY,
-    toSessionString(expiredSessionState),
-    configuration.trackAnonymousUser ? SESSION_COOKIE_EXPIRATION_DELAY : SESSION_TIME_OUT_DELAY,
+    toSessionString(sessionState),
+    configuration.trackAnonymousUser ? SESSION_COOKIE_EXPIRATION_DELAY : defaultTimeout,
     options
   )
 }

tsconfig.base.json

@@ -21,7 +21,8 @@
       "@flashcatcloud/browser-rum-core": ["./packages/rum-core/src"],
       "@flashcatcloud/browser-rum-react": ["./packages/rum-react/src/entries/main"],
       "@flashcatcloud/browser-rum-react/react-router-v6": ["./packages/rum-react/src/entries/reactRouter"],
-      "@flashcatcloud/browser-rum-react/react-router-v7": ["./packages/rum-react/src/entries/reactRouter"]
+      "@flashcatcloud/browser-rum-react/react-router-v7": ["./packages/rum-react/src/entries/reactRouter"],
+      "@flashcatcloud/browser-flagging": ["./packages/flagging/src/entries/main"]
     }
   }
 }