💥 [RUM-7704] Remove anonymous user feature flag for v6 #3216
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ import { Observable } from '../../tools/observable' | |
| import { ONE_SECOND, dateNow } from '../../tools/utils/timeUtils' | ||
| import { throttle } from '../../tools/utils/functionUtils' | ||
| import { generateUUID } from '../../tools/utils/stringUtils' | ||
| import type { InitConfiguration, Configuration } from '../configuration' | ||
| import { selectCookieStrategy, initCookieStrategy } from './storeStrategies/sessionInCookie' | ||
| import type { SessionStoreStrategyType } from './storeStrategies/sessionStoreStrategy' | ||
| import { | ||
|
|
@@ -58,6 +58,7 @@ export function selectSessionStoreStrategyType( | |
| */ | ||
| export function startSessionStore<TrackingType extends string>( | ||
| sessionStoreStrategyType: SessionStoreStrategyType, | ||
| configuration: Configuration, | ||
| productKey: string, | ||
| computeSessionState: (rawTrackingType?: string) => { trackingType: TrackingType; isTracked: boolean } | ||
| ): SessionStore { | ||
|
|
@@ -67,8 +68,8 @@ export function startSessionStore<TrackingType extends string>( | |
|
|
||
| const sessionStoreStrategy = | ||
| sessionStoreStrategyType.type === 'Cookie' | ||
| ? initCookieStrategy(configuration, sessionStoreStrategyType.cookieOptions) | ||
| : initLocalStorageStrategy(configuration) | ||
| const { expireSession } = sessionStoreStrategy | ||
|
|
||
| const watchSessionTimeoutId = setInterval(watchSession, STORAGE_POLL_DELAY) | ||
|
|
@@ -117,7 +118,7 @@ export function startSessionStore<TrackingType extends string>( | |
| processSessionStoreOperations( | ||
| { | ||
| process: (sessionState) => | ||
| isSessionInExpiredState(sessionState) ? getExpiredSessionState(sessionState, configuration) : undefined, | ||
| after: synchronizeSession, | ||
| }, | ||
| sessionStoreStrategy | ||
|
|
@@ -126,7 +127,7 @@ export function startSessionStore<TrackingType extends string>( | |
|
|
||
| function synchronizeSession(sessionState: SessionState) { | ||
| if (isSessionInExpiredState(sessionState)) { | ||
| sessionState = getExpiredSessionState(sessionState, configuration) | ||
| } | ||
| if (hasSessionInCache()) { | ||
| if (isSessionInCacheOutdated(sessionState)) { | ||
|
|
@@ -144,7 +145,7 @@ export function startSessionStore<TrackingType extends string>( | |
| { | ||
| process: (sessionState) => { | ||
| if (isSessionInNotStartedState(sessionState)) { | ||
| return getExpiredSessionState(sessionState, configuration) | ||
| } | ||
| }, | ||
| after: (sessionState) => { | ||
|
|
@@ -178,7 +179,7 @@ export function startSessionStore<TrackingType extends string>( | |
| } | ||
|
|
||
| function expireSessionInCache() { | ||
| sessionCache = getExpiredSessionState(sessionCache, configuration) | ||
| expireObservable.notify() | ||
| } | ||
|
|
||
|
|
@@ -208,7 +209,7 @@ export function startSessionStore<TrackingType extends string>( | |
| expire: () => { | ||
| cancelExpandOrRenewSession() | ||
| expireSession(sessionCache) | ||
| synchronizeSession(getExpiredSessionState(sessionCache, configuration)) | ||
| }, | ||
| stop: () => { | ||
| clearInterval(watchSessionTimeoutId) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| import type { MockStorage } from '../../../test' | ||
| import { mockClock, mockCookie, mockLocalStorage } from '../../../test' | ||
| import type { CookieOptions } from '../../browser/cookie' | ||
| import type { Configuration } from '../configuration' | ||
| import { initCookieStrategy } from './storeStrategies/sessionInCookie' | ||
| import { initLocalStorageStrategy } from './storeStrategies/sessionInLocalStorage' | ||
| import type { SessionState } from './sessionState' | ||
|
|
@@ -9,19 +10,19 @@ import { processSessionStoreOperations, LOCK_MAX_TRIES, LOCK_RETRY_DELAY } from | |
| import { SESSION_STORE_KEY } from './storeStrategies/sessionStoreStrategy' | ||
|
|
||
| const cookieOptions: CookieOptions = {} | ||
| const EXPIRED_SESSION: SessionState = { isExpired: '1', anonymousId: '0' } | ||
| const DEFAULT_INIT_CONFIGURATION = { trackAnonymousUser: true } as Configuration | ||
| ;( | ||
| [ | ||
| { | ||
| title: 'Cookie Storage', | ||
| createSessionStoreStrategy: () => initCookieStrategy(DEFAULT_INIT_CONFIGURATION, cookieOptions), | ||
| mockStorage: mockCookie, | ||
| storageKey: SESSION_STORE_KEY, | ||
| }, | ||
| { | ||
| title: 'Local Storage', | ||
| createSessionStoreStrategy: () => initLocalStorageStrategy(DEFAULT_INIT_CONFIGURATION), | ||
| mockStorage: mockLocalStorage, | ||
| storageKey: SESSION_STORE_KEY, | ||
| }, | ||
|
|
@@ -37,6 +38,7 @@ const EXPIRED_SESSION: SessionState = { isExpired: '1' } | |
| const now = Date.now() | ||
|
|
||
| beforeEach(() => { | ||
| spyOn(Math, 'random').and.callFake(() => 0) | ||
| sessionStoreStrategy.expireSession(initialSession) | ||
| initialSession = { id: '123', created: String(now) } | ||
| otherSession = { id: '456', created: String(now + 100) } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,20 @@ | ||
| import { resetExperimentalFeatures } from '../../../tools/experimentalFeatures' | ||
| import { mockClock } 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 { buildCookieOptions, selectCookieStrategy, initCookieStrategy } from './sessionInCookie' | ||
| import type { SessionStoreStrategy } from './sessionStoreStrategy' | ||
| import { SESSION_STORE_KEY } from './sessionStoreStrategy' | ||
|
|
||
| export const DEFAULT_INIT_CONFIGURATION = { trackAnonymousUser: true } as Configuration | ||
| describe('session in cookie strategy', () => { | ||
| const sessionState: SessionState = { id: '123', created: '0' } | ||
| let cookieStorageStrategy: SessionStoreStrategy | ||
|
|
||
| beforeEach(() => { | ||
| cookieStorageStrategy = initCookieStrategy(DEFAULT_INIT_CONFIGURATION, {}) | ||
| }) | ||
|
|
||
| afterEach(() => { | ||
|
|
@@ -25,12 +28,13 @@ describe('session in cookie strategy', () => { | |
| expect(getCookie(SESSION_STORE_KEY)).toBe('id=123&created=0') | ||
| }) | ||
|
|
||
| it('should set `isExpired=1` and `aid` to the cookie holding the session', () => { | ||
| spyOn(Math, 'random').and.callFake(() => 0) | ||
| cookieStorageStrategy.persistSession(sessionState) | ||
| cookieStorageStrategy.expireSession(sessionState) | ||
| const session = cookieStorageStrategy.retrieveSession() | ||
| expect(session).toEqual({ isExpired: '1', anonymousId: '0' }) | ||
| expect(getCookie(SESSION_STORE_KEY)).toBe('isExpired=1&aid=0') | ||
| }) | ||
|
|
||
| it('should return an empty object if session string is invalid', () => { | ||
|
|
@@ -99,33 +103,33 @@ describe('session in cookie strategy', () => { | |
| }) | ||
| }) | ||
| }) | ||
| describe('session in cookie strategy when opt-out anonymous user tracking', () => { | ||
| const anonymousId = 'device-123' | ||
| const sessionState: SessionState = { id: '123', created: '0' } | ||
| let cookieStorageStrategy: SessionStoreStrategy | ||
|
|
||
| beforeEach(() => { | ||
| cookieStorageStrategy = initCookieStrategy({ trackAnonymousUser: false } as Configuration, {}) | ||
| }) | ||
|
|
||
| afterEach(() => { | ||
| resetExperimentalFeatures() | ||
| deleteCookie(SESSION_STORE_KEY) | ||
| }) | ||
|
|
||
| it('should not extend cookie expiration time when opt-out', () => { | ||
| 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_TIME_OUT_DELAY)).toUTCString()) | ||
| clock.cleanup() | ||
| }) | ||
|
|
||
| it('should not persist or expire a session with anonymous id when opt-out', () => { | ||
| cookieStorageStrategy.persistSession({ ...sessionState, anonymousId }) | ||
| cookieStorageStrategy.expireSession({ ...sessionState, anonymousId }) | ||
| const session = cookieStorageStrategy.retrieveSession() | ||
| expect(session).toEqual({ isExpired: '1' }) | ||
| expect(getCookie(SESSION_STORE_KEY)).toBe('isExpired=1') | ||
| }) | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💬 suggestion: I don't think the anonymous id value is tested in this test. Maybe remove this line?