Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(flags): Make sure we don't override flags when decide is disabled #911

Merged
merged 1 commit into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/__tests__/decide.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ describe('Decide', () => {
expect(console.error).toHaveBeenCalledWith('[PostHog.js]', 'Failed to fetch feature flags from PostHog.')
})

it('Make sure receivedFeatureFlags is called with empty if advanced_disable_feature_flags_on_first_load is set', () => {
it('Make sure receivedFeatureFlags is not called if advanced_disable_feature_flags_on_first_load is set', () => {
given('decideResponse', () => ({
enable_collect_everything: true,
featureFlags: { 'test-flag': true },
Expand All @@ -191,6 +191,27 @@ describe('Decide', () => {
expect(given.posthog.featureFlags.receivedFeatureFlags).not.toHaveBeenCalled()
})

it('Make sure receivedFeatureFlags is not called if advanced_disable_feature_flags is set', () => {
given('decideResponse', () => ({
enable_collect_everything: true,
featureFlags: { 'test-flag': true },
}))
given('config', () => ({
api_host: 'https://test.com',
token: 'testtoken',
persistence: 'memory',
advanced_disable_feature_flags: true,
}))

given.subject()

expect(autocapture.afterDecideResponse).toHaveBeenCalledWith(given.decideResponse, given.posthog)
expect(given.posthog.sessionRecording.afterDecideResponse).toHaveBeenCalledWith(given.decideResponse)
expect(given.posthog.toolbar.afterDecideResponse).toHaveBeenCalledWith(given.decideResponse)

expect(given.posthog.featureFlags.receivedFeatureFlags).not.toHaveBeenCalled()
})

it('runs site apps if opted in', () => {
given('config', () => ({ api_host: 'https://test.com', opt_in_site_apps: true, persistence: 'memory' }))
given('decideResponse', () => ({ siteApps: [{ id: 1, url: '/site_app/1/tokentoken/hash/' }] }))
Expand Down
34 changes: 23 additions & 11 deletions src/__tests__/featureflags.js
Original file line number Diff line number Diff line change
Expand Up @@ -559,25 +559,37 @@ describe('featureflags', () => {
...given.instance.config,
advanced_disable_feature_flags: true,
}
given.instance.persistence.register({
$enabled_feature_flags: {
'beta-feature': true,
'random-feature': 'xatu',
},
})

given.featureFlags.reloadFeatureFlags()

jest.runAllTimers()

expect(given.featureFlags.getFlagVariants()).toEqual({
first: 'variant-1',
second: true,
'beta-feature': true,
'random-feature': 'xatu',
})

// check the request sent disable_flags
expect(
JSON.parse(Buffer.from(given.instance._send_request.mock.calls[0][1].data, 'base64').toString())
).toEqual({
token: 'random fake token',
distinct_id: 'blah id',
person_properties: { a: 'b', c: 'd' },
disable_flags: true,
// check reload request was not sent
expect(given.instance._send_request).not.toHaveBeenCalled()

// check the same for other ways to call reload flags

given.featureFlags.setPersonPropertiesForFlags({ a: 'b', c: 'd' })

jest.runAllTimers()

expect(given.featureFlags.getFlagVariants()).toEqual({
'beta-feature': true,
'random-feature': 'xatu',
})

// check reload request was not sent
expect(given.instance._send_request).not.toHaveBeenCalled()
})
})

Expand Down
5 changes: 4 additions & 1 deletion src/decide.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ export class Decide {
autocapture.afterDecideResponse(response, this.instance)
this.instance._afterDecideResponse(response)

if (!this.instance.config.advanced_disable_feature_flags_on_first_load) {
if (
!this.instance.config.advanced_disable_feature_flags_on_first_load &&
!this.instance.config.advanced_disable_feature_flags
) {
this.instance.featureFlags.receivedFeatureFlags(response)
}

Expand Down
4 changes: 4 additions & 0 deletions src/posthog-featureflags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ export class PostHogFeatureFlags {
}

_reloadFeatureFlagsRequest(): void {
if (this.instance.config.advanced_disable_feature_flags) {
return
}

this.setReloadingPaused(true)
const token = this.instance.config.token
const personProperties = this.instance.get_property(STORED_PERSON_PROPERTIES_KEY)
Expand Down
Loading