DX: Split out feature flags from the Me user data endpoint

eslint-local-rules/persistBackgroundData.txt

@@ -11,9 +11,10 @@
 ./src/analysis/analysisVisitors/regexAnalysis.ts
 ./src/analysis/analysisVisitors/varAnalysis/varMap.ts
 ./src/auth/authConstants.ts
+./src/auth/authStorage.ts
 ./src/auth/authTypes.ts
 ./src/auth/authUtils.ts
-./src/auth/token.ts
+./src/auth/featureFlags.ts
 ./src/components/annotationAlert/FieldAnnotationAlert.tsx
 ./src/components/AsyncButton.tsx
 ./src/components/DelayedRender.tsx
@@ -255,7 +256,6 @@
 ./src/store/settings/settingsStorage.ts
 ./src/store/settings/settingsTypes.ts
 ./src/store/StorageInterface.ts
-./src/store/syncFlags.ts
 ./src/telemetry/BackgroundLogger.ts
 ./src/telemetry/deployments.ts
 ./src/telemetry/dnt.ts

jest.config.js

@@ -31,7 +31,7 @@ const config = {
     "^.+\\.txt$": "<rootDir>/src/testUtils/rawJestTransformer.mjs",
   },
   transformIgnorePatterns: [
-    "node_modules/(?!@cfworker|escape-string-regex|filename-reserved-regex|filenamify|idb|webext-|p-timeout|p-retry|p-defer|p-memoize|serialize-error|strip-outer|trim-repeated|mimic-fn|urlpattern-polyfill|url-join|uuid|nanoid|use-debounce|copy-text-to-clipboard|linkify-urls|create-html-element|stringify-attributes|escape-goat|stemmer|uint8array-extras|one-event|abort-utils|batched-function|is-network-error|text-field-edit)",
+    "node_modules/(?!@cfworker|escape-string-regex|filename-reserved-regex|filenamify|idb|webext-|p-timeout|p-retry|p-defer|p-memoize|serialize-error|strip-outer|trim-repeated|mimic-fn|urlpattern-polyfill|url-join|uuid|nanoid|use-debounce|copy-text-to-clipboard|linkify-urls|create-html-element|stringify-attributes|escape-goat|stemmer|uint8array-extras|one-event|abort-utils|batched-function|is-network-error|text-field-edit|webext-storage-cache|@sindresorhus/to-milliseconds)",
   ],
   setupFiles: [
     "dotenv/config",

package.json

@@ -173,6 +173,7 @@
     "webext-permissions": "^3.1.2",
     "webext-polyfill-kinda": "^1.0.2",
     "webext-storage": "^1.2.2",
+    "webext-storage-cache": "^6.0.0",
     "webext-tools": "^1.2.3",
     "webextension-polyfill": "^0.10.0",
     "whatwg-mimetype": "^4.0.0",

src/auth/RequireAuth.tsx

@@ -19,7 +19,7 @@ import React, { useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import Loader from "@/components/Loader";
 import { useGetMeQuery } from "@/data/service/api";
-import { clearCachedAuthSecrets, updateUserData } from "@/auth/token";
+import { clearCachedAuthSecrets, updateUserData } from "@/auth/authStorage";
 import {
   selectExtensionAuthState,
   selectUserDataUpdate,

src/auth/authConstants.ts

@@ -28,7 +28,6 @@ export const anonAuth: AuthState = Object.freeze({
   isTestAccount: false,
   extension: true,
   scope: null,
-  flags: [],
   milestones: [],
   organizations: [],
   groups: [],

src/auth/authSelectors.ts

@@ -21,7 +21,6 @@ export const selectAuth = (state: AuthRootState) => state.auth;
 export const selectIsLoggedIn = (state: AuthRootState) =>
   selectAuth(state).isLoggedIn;
 export const selectScope = (state: AuthRootState) => selectAuth(state).scope;
-export const selectFlags = (state: AuthRootState) => selectAuth(state).flags;
 export const selectMilestones = (state: AuthRootState) =>
   selectAuth(state).milestones;
 export const selectOrganizations = (state: AuthRootState) =>

src/auth/authSlice.ts

@@ -33,7 +33,6 @@ export const authSlice = createSlice({
       return {
         ...payload,
         scope: isEmpty(payload.scope) ? null : payload.scope,
-        flags: Array.isArray(payload.flags) ? payload.flags : [],
         organizations: Array.isArray(payload.organizations)
           ? payload.organizations
           : [],

src/auth/authTypes.ts

@@ -56,10 +56,6 @@ export type UserData = Partial<{
    * The user's organization for engagement and error attribution
    */
   telemetryOrganizationId: UUID | null;
-  /**
-   * Feature flags
-   */
-  flags: string[];
   /**
    * Organizations the user is a member of
    */
@@ -108,7 +104,6 @@ export const USER_DATA_UPDATE_KEYS: Array<keyof UserDataUpdate> = [
   "telemetryOrganizationId",
   "organizations",
   "groups",
-  "flags",
   "enforceUpdateMillis",
   "partner",
   "partnerPrincipals",
@@ -235,11 +230,6 @@ export type AuthState = {
     name: string;
   }>;
 
-  /**
-   * List of feature flags for the user.
-   */
-  readonly flags: string[];
-
   /**
    * List of milestones for the user. A Milestone represents progress through the PixieBrix product.
    */

src/auth/authUtils.ts

@@ -17,7 +17,6 @@
 
 import { type Me } from "@/types/contract";
 import { type UserDataUpdate, type AuthState } from "@/auth/authTypes";
-import { readAuthData } from "@/auth/token";
 
 // Used by the app
 function selectOrganizations(
@@ -52,7 +51,6 @@ export function selectUserDataUpdate({
   telemetry_organization: telemetryOrganization,
   organization_memberships: organizationMemberships = [],
   group_memberships = [],
-  flags = [],
   partner,
   enforce_update_millis: enforceUpdateMillis,
   partner_principals: partnerPrincipals = [],
@@ -67,7 +65,6 @@ export function selectUserDataUpdate({
     email: email!,
     organizationId: organization?.id ?? null,
     telemetryOrganizationId: telemetryOrganization?.id ?? null,
-    flags,
     organizations,
     groups,
     partner: partner ?? null,
@@ -84,7 +81,6 @@ export function selectExtensionAuthState({
   telemetry_organization,
   is_onboarded: isOnboarded,
   test_account: isTestAccount = false,
-  flags = [],
   milestones = [],
   organization_memberships: organizationMemberships = [],
   group_memberships = [],
@@ -106,18 +102,8 @@ export function selectExtensionAuthState({
     telemetryOrganizationId: telemetry_organization?.id,
     organizations,
     groups,
-    flags,
     milestones,
     partner,
     enforceUpdateMillis,
   };
 }
-
-/**
- * Returns true if the specified flag is on for the current user.
- * @param flag the feature flag to check
- */
-export async function flagOn(flag: string): Promise<boolean> {
-  const authData = await readAuthData();
-  return authData.flags?.includes(flag) ?? false;
-}

src/auth/featureFlagStorage.test.ts

@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2024 PixieBrix, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import {
+  fetchFeatureFlags,
+  flagOn,
+  resetFeatureFlags,
+  TEST_overrideFeatureFlags,
+} from "@/auth/featureFlagStorage";
+import { appApiMock } from "@/testUtils/appApiMock";
+import { TEST_setAuthData, TEST_triggerListeners } from "@/auth/authStorage";
+import { tokenAuthDataFactory } from "@/testUtils/factories/authFactories";
+import { fetchFeatureFlagsInBackground } from "@/background/messenger/api";
+
+describe("featureFlags", () => {
+  beforeEach(async () => {
+    // Wire up the real fetch function so we can mock the api responses
+    jest
+      .mocked(fetchFeatureFlagsInBackground)
+      .mockImplementation(fetchFeatureFlags);
+    appApiMock.reset();
+    appApiMock.onGet("/api/me/").reply(200, {
+      flags: [],
+    });
+  });
+
+  afterEach(async () => {
+    await resetFeatureFlags();
+    jest.useRealTimers();
+  });
+
+  it("returns true if flag is present", async () => {
+    // eslint-disable-next-line new-cap
+    await TEST_overrideFeatureFlags([
+      "test-flag",
+      "test-other-flag",
+      "test-other-flag-2",
+    ]);
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+  });
+
+  it("returns false if flag is not present", async () => {
+    // eslint-disable-next-line new-cap
+    await TEST_overrideFeatureFlags(["test-other-flag", "test-other-flag-2"]);
+    await expect(flagOn("test-flag")).resolves.toBe(false);
+  });
+
+  it("fetches flags on initial storage state", async () => {
+    appApiMock.onGet("/api/me/").reply(200, {
+      flags: ["test-flag"],
+    });
+
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    expect(appApiMock.history.get).toHaveLength(1);
+  });
+
+  it("does not fetch if flags have been updated recently", async () => {
+    // eslint-disable-next-line new-cap
+    await TEST_overrideFeatureFlags(["test-flag"]);
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    expect(appApiMock.history.get).toHaveLength(0);
+  });
+
+  it("only fetches once if multiple calls are made within the timeout", async () => {
+    appApiMock.onGet("/api/me/").reply(200, {
+      flags: ["test-flag"],
+    });
+
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    expect(appApiMock.history.get).toHaveLength(1);
+  });
+
+  it("fetches flags again if a call is made after the timeout", async () => {
+    jest.useFakeTimers();
+
+    appApiMock.onGet("/api/me/").reply(200, {
+      flags: ["test-flag"],
+    });
+
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    expect(appApiMock.history.get).toHaveLength(1);
+
+    jest.advanceTimersByTime(31_000);
+
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    await expect(flagOn("test-flag")).resolves.toBe(true);
+    expect(appApiMock.history.get).toHaveLength(2);
+  });
+
+  it("fetches flags again if auth is reset in between calls", async () => {
+    appApiMock.onGet("/api/me/").reply(200, {
+      flags: ["test-flag", "secret-flag"],
+    });
+
+    await expect(flagOn("secret-flag")).resolves.toBe(true);
+    await expect(flagOn("secret-flag")).resolves.toBe(true);
+    expect(appApiMock.history.get).toHaveLength(1);
+
+    const authData = tokenAuthDataFactory();
+    // eslint-disable-next-line new-cap
+    await TEST_setAuthData(authData);
+    // eslint-disable-next-line new-cap
+    TEST_triggerListeners(authData);
+
+    // New user doesn't have secret flag
+    appApiMock.onGet("/api/me/").reply(200, {
+      flags: ["test-flag"],
+    });
+
+    await expect(flagOn("secret-flag")).resolves.toBe(false);
+    await expect(flagOn("secret-flag")).resolves.toBe(false);
+    expect(appApiMock.history.get).toHaveLength(2);
+  });
+});