Skip to content
1 change: 1 addition & 0 deletions src/composables/__mocks__/useFeatureFlags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const defaultFlags: FeatureFlags = {
hostedBillingWebEnabled: false,
showSignInButton: undefined,
unifiedCloudAuthEnabled: false,
unifiedWebSessionEnabled: false,
billingControlEnabled: false,
legacyBillingMigrationEnabled: false,
embeddedCheckoutEnabled: false,
Expand Down
147 changes: 147 additions & 0 deletions src/composables/useFeatureFlags.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,153 @@ describe('useFeatureFlags', () => {
})
})

describe('unifiedWebSessionEnabled', () => {
beforeEach(() => {
vi.mocked(distributionTypes).isCloud = true
vi.mocked(api.getServerFeature).mockImplementation(
(_path, defaultValue) => defaultValue
)
})

afterEach(() => {
vi.mocked(distributionTypes).isCloud = false
remoteConfigState.value = 'unloaded'
remoteConfig.value = {}
})

it.for([
{
name: 'is off when /api/features lacks the flag',
state: 'authenticated',
config: {},
expected: false
},
{
name: 'is off when remote config failed to load',
state: 'error',
config: {},
expected: false
},
{
name: 'is on when the server sends true',
state: 'authenticated',
config: { unified_web_session: true },
expected: true
}
] as const)('$name', ({ state, config, expected }) => {
remoteConfigState.value = state
remoteConfig.value = config

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(expected)
})

it('ignores the server-feature fallback when /api/features lacks the flag', () => {
remoteConfigState.value = 'authenticated'
vi.mocked(api.getServerFeature).mockImplementation(
(path, defaultValue) =>
path === ServerFeatureFlag.UNIFIED_WEB_SESSION ? true : defaultValue
)

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(false)
})

it.for(['"true"', '"false"', '1'])(
'is off for the malformed override value %s',
(rawValue) => {
remoteConfigState.value = 'authenticated'
localStorage.setItem(
`ff:${ServerFeatureFlag.UNIFIED_WEB_SESSION}`,
rawValue
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
)

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(false)
}
)

it('lets a false ff: override turn off a server true', () => {
remoteConfigState.value = 'authenticated'
remoteConfig.value = { unified_web_session: true }
localStorage.setItem(
`ff:${ServerFeatureFlag.UNIFIED_WEB_SESSION}`,
'false'
)

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(false)
})

it('lets a false ?ff= override beat a true ff: override and server value', () => {
remoteConfigState.value = 'authenticated'
remoteConfig.value = { unified_web_session: true }
localStorage.setItem(
`ff:${ServerFeatureFlag.UNIFIED_WEB_SESSION}`,
'true'
)
vi.mocked(getSessionOverride).mockImplementation((flagKey) =>
flagKey === ServerFeatureFlag.UNIFIED_WEB_SESSION ? false : undefined
)

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(false)
})

it('honours the ff: localStorage dev override', () => {
remoteConfigState.value = 'authenticated'
localStorage.setItem(
`ff:${ServerFeatureFlag.UNIFIED_WEB_SESSION}`,
'true'
)

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(true)
})

it('honours the ?ff= session override', () => {
remoteConfigState.value = 'authenticated'
vi.mocked(getSessionOverride).mockImplementation((flagKey) =>
flagKey === ServerFeatureFlag.UNIFIED_WEB_SESSION ? true : undefined
)

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(true)
})

it('is off outside the cloud distribution', () => {
vi.mocked(distributionTypes).isCloud = false
remoteConfigState.value = 'authenticated'
remoteConfig.value = { unified_web_session: true }

expect(useFeatureFlags().flags.unifiedWebSessionEnabled).toBe(false)
})

it.for([
{
name: 'unified_cloud_auth on does not turn it on',
config: { unified_cloud_auth: true },
expected: {
unifiedCloudAuthEnabled: true,
unifiedWebSessionEnabled: false
}
},
{
name: 'it turns on without unified_cloud_auth and leaves that flag off',
config: { unified_cloud_auth: false, unified_web_session: true },
expected: {
unifiedCloudAuthEnabled: false,
unifiedWebSessionEnabled: true
}
}
])(
'is independent of unified_cloud_auth: $name',
({ config, expected }) => {
remoteConfigState.value = 'authenticated'
remoteConfig.value = config

const { flags } = useFeatureFlags()
expect({
unifiedCloudAuthEnabled: flags.unifiedCloudAuthEnabled,
unifiedWebSessionEnabled: flags.unifiedWebSessionEnabled
}).toEqual(expected)
}
)
})

describe('session override precedence', () => {
afterEach(() => {
vi.mocked(getSessionOverride).mockReset()
Expand Down
11 changes: 11 additions & 0 deletions src/composables/useFeatureFlags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export enum ServerFeatureFlag {
HOSTED_BILLING_DESTINATION = 'hosted_billing_destination',
SHOW_SIGNIN_BUTTON = 'show_signin_button',
UNIFIED_CLOUD_AUTH = 'unified_cloud_auth',
UNIFIED_WEB_SESSION = 'unified_web_session',
BILLING_CONTROL_ENABLED = 'billing_control_enabled',
LEGACY_BILLING_MIGRATION_ENABLED = 'legacy_billing_migration_enabled',
EMBEDDED_CHECKOUT_ENABLED = 'embedded_checked_enabled',
Expand Down Expand Up @@ -257,6 +258,16 @@ export function useFeatureFlags() {
false
)
},
get unifiedWebSessionEnabled() {
if (!isCloud) return false

const key = ServerFeatureFlag.UNIFIED_WEB_SESSION
const value =
getSessionOverride<unknown>(key) ??
getDevOverride<unknown>(key) ??
remoteConfig.value.unified_web_session
return value === true
},
get billingControlEnabled() {
return resolveAuthGatedFlag(
ServerFeatureFlag.BILLING_CONTROL_ENABLED,
Expand Down
Loading
Loading