@budibase/backend-core 2.32.11 → 2.32.13

package/dist/tests/core/utilities/structures/accounts.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selfSSOCreateAccount = exports.selfCreateAccount = exports.cloudVerifiableSSOCreateAccount = exports.cloudSSOCreateAccount = exports.cloudCreateAccount = exports.cloudAccount = exports.account = void 0;
+exports.cloudAccount = exports.account = void 0;
 exports.selfHostAccount = selfHostAccount;
 exports.ssoAccount = ssoAccount;
 exports.verifiableSsoAccount = verifiableSsoAccount;
@@ -12,7 +12,7 @@ const docIds_1 = require("../../../../src/docIds");
 const types_1 = require("@budibase/types");
 const sample_1 = __importDefault(require("lodash/sample"));
 const account = (partial = {}) => {
-    return Object.assign({ accountId: (0, _1.uuid)(), tenantId: _1.generator.word(), email: _1.generator.email({ domain: "example.com" }), tenantName: _1.generator.word(), hosting: types_1.Hosting.SELF, createdAt: Date.now(), verified: true, verificationSent: true, authType: types_1.AuthType.PASSWORD, name: _1.generator.name(), size: "10+", profession: "Software Engineer", quotaUsage: _1.quotas.usage() }, partial);
+    return Object.assign({ accountId: (0, _1.uuid)(), tenantId: _1.generator.word(), email: _1.generator.email({ domain: "example.com" }), accountName: _1.generator.word(), tenantName: _1.generator.word(), hosting: types_1.Hosting.SELF, createdAt: Date.now(), verified: true, verificationSent: true, authType: types_1.AuthType.PASSWORD, name: _1.generator.name(), size: "10+", profession: "Software Engineer", quotaUsage: _1.quotas.usage() }, partial);
 };
 exports.account = account;
 function selfHostAccount() {
@@ -32,66 +32,12 @@ function ssoAccount(account = (0, exports.cloudAccount)()) {
     return Object.assign(Object.assign({}, account), { authType: types_1.AuthType.SSO, oauth2: {
             accessToken: _1.generator.string(),
             refreshToken: _1.generator.string(),
-        }, pictureUrl: _1.generator.url(), provider: provider(), providerType: providerType(), thirdPartyProfile: {} });
+        }, provider: provider(), providerType: providerType() });
 }
 function verifiableSsoAccount(account = (0, exports.cloudAccount)()) {
     return Object.assign(Object.assign({}, account), { authType: types_1.AuthType.SSO, oauth2: {
             accessToken: _1.generator.string(),
             refreshToken: _1.generator.string(),
-        }, pictureUrl: _1.generator.url(), provider: types_1.AccountSSOProvider.MICROSOFT, providerType: types_1.AccountSSOProviderType.MICROSOFT, thirdPartyProfile: { id: "abc123" } });
+        }, provider: types_1.AccountSSOProvider.MICROSOFT, providerType: types_1.AccountSSOProviderType.MICROSOFT });
 }
-exports.cloudCreateAccount = {
-    email: "cloud@budibase.com",
-    tenantId: "cloud",
-    hosting: types_1.Hosting.CLOUD,
-    authType: types_1.AuthType.PASSWORD,
-    password: "Password123!",
-    tenantName: "cloud",
-    name: "Budi Armstrong",
-    size: "10+",
-    profession: "Software Engineer",
-};
-exports.cloudSSOCreateAccount = {
-    email: "cloud-sso@budibase.com",
-    tenantId: "cloud-sso",
-    hosting: types_1.Hosting.CLOUD,
-    authType: types_1.AuthType.SSO,
-    tenantName: "cloudsso",
-    name: "Budi Armstrong",
-    size: "10+",
-    profession: "Software Engineer",
-};
-exports.cloudVerifiableSSOCreateAccount = {
-    email: "cloud-sso@budibase.com",
-    tenantId: "cloud-sso",
-    hosting: types_1.Hosting.CLOUD,
-    authType: types_1.AuthType.SSO,
-    tenantName: "cloudsso",
-    name: "Budi Armstrong",
-    size: "10+",
-    profession: "Software Engineer",
-    provider: types_1.AccountSSOProvider.MICROSOFT,
-    thirdPartyProfile: { id: "abc123" },
-};
-exports.selfCreateAccount = {
-    email: "self@budibase.com",
-    tenantId: "self",
-    hosting: types_1.Hosting.SELF,
-    authType: types_1.AuthType.PASSWORD,
-    password: "Password123!",
-    tenantName: "self",
-    name: "Budi Armstrong",
-    size: "10+",
-    profession: "Software Engineer",
-};
-exports.selfSSOCreateAccount = {
-    email: "self-sso@budibase.com",
-    tenantId: "self-sso",
-    hosting: types_1.Hosting.SELF,
-    authType: types_1.AuthType.SSO,
-    tenantName: "selfsso",
-    name: "Budi Armstrong",
-    size: "10+",
-    profession: "Software Engineer",
-};
 //# sourceMappingURL=accounts.js.map

package/dist/tests/core/utilities/structures/accounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/accounts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/accounts.ts"],"names":[],"mappings":";;;;;;AAiCA,0CAEC;AAkBD,gCAWC;AAED,oDAaC;AA/ED,wBAA2C;AAC3C,mDAA6D;AAC7D,2CAQwB;AACxB,2DAAkC;AAE3B,MAAM,OAAO,GAAG,CAAC,UAA4B,EAAE,EAAW,EAAE;IACjE,uBACE,SAAS,EAAE,IAAA,OAAI,GAAE,EACjB,QAAQ,EAAE,YAAS,CAAC,IAAI,EAAE,EAC1B,KAAK,EAAE,YAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EACjD,WAAW,EAAE,YAAS,CAAC,IAAI,EAAE,EAC7B,UAAU,EAAE,YAAS,CAAC,IAAI,EAAE,EAC5B,OAAO,EAAE,eAAO,CAAC,IAAI,EACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EACrB,QAAQ,EAAE,IAAI,EACd,gBAAgB,EAAE,IAAI,EACtB,QAAQ,EAAE,gBAAQ,CAAC,QAAQ,EAC3B,IAAI,EAAE,YAAS,CAAC,IAAI,EAAE,EACtB,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,SAAM,CAAC,KAAK,EAAE,IACvB,OAAO,EACX;AACH,CAAC,CAAA;AAlBY,QAAA,OAAO,WAkBnB;AAED,SAAgB,eAAe;IAC7B,OAAO,IAAA,eAAO,GAAE,CAAA;AAClB,CAAC;AAEM,MAAM,YAAY,GAAG,GAAiB,EAAE;IAC7C,uCACK,IAAA,eAAO,GAAE,KACZ,OAAO,EAAE,eAAO,CAAC,KAAK,EACtB,cAAc,EAAE,IAAA,6BAAoB,GAAE,IACvC;AACH,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB;AAED,SAAS,YAAY;IACnB,OAAO,IAAA,gBAAM,EAAC,MAAM,CAAC,MAAM,CAAC,8BAAsB,CAAC,CAA2B,CAAA;AAChF,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,IAAA,gBAAM,EAAC,MAAM,CAAC,MAAM,CAAC,0BAAkB,CAAC,CAAuB,CAAA;AACxE,CAAC;AAED,SAAgB,UAAU,CAAC,UAAmB,IAAA,oBAAY,GAAE;IAC1D,uCACK,OAAO,KACV,QAAQ,EAAE,gBAAQ,CAAC,GAAG,EACtB,MAAM,EAAE;YACN,WAAW,EAAE,YAAS,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,YAAS,CAAC,MAAM,EAAE;SACjC,EACD,QAAQ,EAAE,QAAQ,EAAE,EACpB,YAAY,EAAE,YAAY,EAAE,IAC7B;AACH,CAAC;AAED,SAAgB,oBAAoB,CAClC,UAAmB,IAAA,oBAAY,GAAE;IAEjC,uCACK,OAAO,KACV,QAAQ,EAAE,gBAAQ,CAAC,GAAG,EACtB,MAAM,EAAE;YACN,WAAW,EAAE,YAAS,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,YAAS,CAAC,MAAM,EAAE;SACjC,EACD,QAAQ,EAAE,0BAAkB,CAAC,SAAS,EACtC,YAAY,EAAE,8BAAsB,CAAC,SAAS,IAC/C;AACH,CAAC"}

package/dist/tests/core/utilities/structures/users.js

@@ -12,7 +12,7 @@ const newEmail = () => {
 exports.newEmail = newEmail;
 const user = (userProps) => {
     const userId = userProps === null || userProps === void 0 ? void 0 : userProps._id;
-    return Object.assign({ _id: userId, userId, email: (0, exports.newEmail)(), password: "password123!", roles: { app_test: "admin" }, firstName: generator_1.generator.first(), lastName: generator_1.generator.last(), pictureUrl: "http://example.com", tenantId: _1.tenant.id() }, userProps);
+    return Object.assign({ _id: userId, userId, email: (0, exports.newEmail)(), password: "password123!", roles: { app_test: "admin" }, firstName: generator_1.generator.first(), lastName: generator_1.generator.last(), tenantId: _1.tenant.id() }, userProps);
 };
 exports.user = user;
 const adminUser = (userProps) => {
@@ -48,9 +48,6 @@ function ssoUser(opts = {}) {
     if (!opts.details) {
         opts.details = (0, sso_1.authDetails)(base);
     }
-    return Object.assign(Object.assign({}, base), { forceResetPassword: false, oauth2: (_a = opts.details) === null || _a === void 0 ? void 0 : _a.oauth2, provider: (_b = opts.details) === null || _b === void 0 ? void 0 : _b.provider, providerType: (_c = opts.details) === null || _c === void 0 ? void 0 : _c.providerType, thirdPartyProfile: {
-            email: base.email,
-            picture: base.pictureUrl,
-        } });
+    return Object.assign(Object.assign({}, base), { forceResetPassword: false, oauth2: (_a = opts.details) === null || _a === void 0 ? void 0 : _a.oauth2, provider: (_b = opts.details) === null || _b === void 0 ? void 0 : _b.provider, providerType: (_c = opts.details) === null || _c === void 0 ? void 0 : _c.providerType });
 }
 //# sourceMappingURL=users.js.map

package/dist/tests/core/utilities/structures/users.js.map

@@ -1 +1 @@
-{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;AAwEA,0BAqBC;AArFD,+BAAmC;AACnC,qCAA+B;AAC/B,2CAAuC;AACvC,wBAA0B;AAEnB,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,OAAO,GAAG,IAAA,aAAI,GAAE,cAAc,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,QAAQ,YAEpB;AAEM,MAAM,IAAI,GAAG,CAAC,SAAyC,EAAQ,EAAE;IACtE,MAAM,MAAM,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA;IAC7B,uBACE,GAAG,EAAE,MAAM,EACX,MAAM,EACN,KAAK,EAAE,IAAA,gBAAQ,GAAE,EACjB,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAC5B,SAAS,EAAE,qBAAS,CAAC,KAAK,EAAE,EAC5B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE,EAC1B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,SAAM,CAAC,EAAE,EAAE,IAClB,SAAS,EACb;AACH,CAAC,CAAA;AAdY,QAAA,IAAI,QAchB;AAEM,MAAM,SAAS,GAAG,CAAC,SAAe,EAAa,EAAE;IACtD,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,EACD,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAEM,MAAM,aAAa,GAAG,CAAC,SAAe,EAAiB,EAAE;IAC9D,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAEM,MAAM,WAAW,GAAG,CAAC,SAAyB,EAAe,EAAE;IACpE,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,SAAe,EAAe,EAAE;IAC5E,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;SACd,IACF;AACH,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAED,SAAgB,OAAO,CACrB,OAAiD,EAAE;;IAEnD,MAAM,IAAI,GAAG,IAAA,YAAI,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,OAAO,IAAI,CAAC,QAAQ,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAA,iBAAW,EAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,uCACK,IAAI,KACP,kBAAkB,EAAE,KAAK,EACzB,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,EAC5B,QAAQ,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAS,EACjC,YAAY,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,YAAa,EACzC,iBAAiB,EAAE;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,UAAU;SACzB,IACF;AACH,CAAC"}
+{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;AAuEA,0BAiBC;AAhFD,+BAAmC;AACnC,qCAA+B;AAC/B,2CAAuC;AACvC,wBAA0B;AAEnB,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,OAAO,GAAG,IAAA,aAAI,GAAE,cAAc,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,QAAQ,YAEpB;AAEM,MAAM,IAAI,GAAG,CAAC,SAAyC,EAAQ,EAAE;IACtE,MAAM,MAAM,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA;IAC7B,uBACE,GAAG,EAAE,MAAM,EACX,MAAM,EACN,KAAK,EAAE,IAAA,gBAAQ,GAAE,EACjB,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAC5B,SAAS,EAAE,qBAAS,CAAC,KAAK,EAAE,EAC5B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE,EAC1B,QAAQ,EAAE,SAAM,CAAC,EAAE,EAAE,IAClB,SAAS,EACb;AACH,CAAC,CAAA;AAbY,QAAA,IAAI,QAahB;AAEM,MAAM,SAAS,GAAG,CAAC,SAAe,EAAa,EAAE;IACtD,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,EACD,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAEM,MAAM,aAAa,GAAG,CAAC,SAAe,EAAiB,EAAE;IAC9D,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAEM,MAAM,WAAW,GAAG,CAAC,SAAyB,EAAe,EAAE;IACpE,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,SAAe,EAAe,EAAE;IAC5E,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;SACd,IACF;AACH,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAED,SAAgB,OAAO,CACrB,OAAiD,EAAE;;IAEnD,MAAM,IAAI,GAAG,IAAA,YAAI,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,OAAO,IAAI,CAAC,QAAQ,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAA,iBAAW,EAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,uCACK,IAAI,KACP,kBAAkB,EAAE,KAAK,EACzB,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,EAC5B,QAAQ,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAS,EACjC,YAAY,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,YAAa,IAC1C;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.32.11",
+  "version": "2.32.13",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
   "dependencies": {
     "@budibase/nano": "10.1.5",
     "@budibase/pouchdb-replication-stream": "1.2.11",
-    "@budibase/shared-core": "2.32.11",
-    "@budibase/types": "2.32.11",
+    "@budibase/shared-core": "2.32.13",
+    "@budibase/types": "2.32.13",
     "aws-cloudfront-sign": "3.0.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.1.0",
@@ -95,5 +95,5 @@
       }
     }
   },
-  "gitHead": "1a1f2ff0948a76863847ce30b2255f43978d6c02"
+  "gitHead": "0478570f8b4ec37b7593a8a1db9715e5e9d99839"
 }

package/src/db/couch/DatabaseImpl.ts

@@ -371,11 +371,21 @@ export class DatabaseImpl implements Database {
     return this.performCall(() => {
       return async () => {
         const response = await directCouchUrlCall(args)
-        const json = await response.json()
+        const text = await response.text()
         if (response.status > 300) {
+          let json
+          try {
+            json = JSON.parse(text)
+          } catch (err) {
+            console.error(`SQS error: ${text}`)
+            throw new CouchDBError(
+              "error while running SQS query, please try again later",
+              { name: "sqs_error", status: response.status }
+            )
+          }
           throw json
         }
-        return json as T
+        return JSON.parse(text) as T
       }
     })
   }

package/src/features/features.ts

@@ -0,0 +1,300 @@
+import env from "../environment"
+import * as context from "../context"
+import { PostHog, PostHogOptions } from "posthog-node"
+import { FeatureFlag, IdentityType, UserCtx } from "@budibase/types"
+import tracer from "dd-trace"
+import { Duration } from "../utils"
+
+let posthog: PostHog | undefined
+export function init(opts?: PostHogOptions) {
+  if (
+    env.POSTHOG_TOKEN &&
+    env.POSTHOG_API_HOST &&
+    !env.SELF_HOSTED &&
+    env.POSTHOG_FEATURE_FLAGS_ENABLED
+  ) {
+    console.log("initializing posthog client...")
+    posthog = new PostHog(env.POSTHOG_TOKEN, {
+      host: env.POSTHOG_API_HOST,
+      personalApiKey: env.POSTHOG_PERSONAL_TOKEN,
+      featureFlagsPollingInterval: Duration.fromMinutes(3).toMs(),
+      ...opts,
+    })
+  } else {
+    console.log("posthog disabled")
+  }
+}
+
+export function shutdown() {
+  posthog?.shutdown()
+}
+
+export abstract class Flag<T> {
+  static boolean(defaultValue: boolean): Flag<boolean> {
+    return new BooleanFlag(defaultValue)
+  }
+
+  static string(defaultValue: string): Flag<string> {
+    return new StringFlag(defaultValue)
+  }
+
+  static number(defaultValue: number): Flag<number> {
+    return new NumberFlag(defaultValue)
+  }
+
+  protected constructor(public defaultValue: T) {}
+
+  abstract parse(value: any): T
+}
+
+type UnwrapFlag<F> = F extends Flag<infer U> ? U : never
+
+export type FlagValues<T> = {
+  [K in keyof T]: UnwrapFlag<T[K]>
+}
+
+type KeysOfType<T, U> = {
+  [K in keyof T]: T[K] extends Flag<U> ? K : never
+}[keyof T]
+
+class BooleanFlag extends Flag<boolean> {
+  parse(value: any) {
+    if (typeof value === "string") {
+      return ["true", "t", "1"].includes(value.toLowerCase())
+    }
+
+    if (typeof value === "boolean") {
+      return value
+    }
+
+    throw new Error(`could not parse value "${value}" as boolean`)
+  }
+}
+
+class StringFlag extends Flag<string> {
+  parse(value: any) {
+    if (typeof value === "string") {
+      return value
+    }
+    throw new Error(`could not parse value "${value}" as string`)
+  }
+}
+
+class NumberFlag extends Flag<number> {
+  parse(value: any) {
+    if (typeof value === "number") {
+      return value
+    }
+
+    if (typeof value === "string") {
+      const parsed = parseFloat(value)
+      if (!isNaN(parsed)) {
+        return parsed
+      }
+    }
+
+    throw new Error(`could not parse value "${value}" as number`)
+  }
+}
+
+export interface EnvFlagEntry {
+  tenantId: string
+  key: string
+  value: boolean
+}
+
+export function parseEnvFlags(flags: string): EnvFlagEntry[] {
+  const split = flags.split(",").map(x => x.split(":"))
+  const result: EnvFlagEntry[] = []
+  for (const [tenantId, ...features] of split) {
+    for (let feature of features) {
+      let value = true
+      if (feature.startsWith("!")) {
+        feature = feature.slice(1)
+        value = false
+      }
+      result.push({ tenantId, key: feature, value })
+    }
+  }
+  return result
+}
+
+export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
+  // This is used to safely cache flags sets in the current request context.
+  // Because multiple sets could theoretically exist, we don't want the cache of
+  // one to leak into another.
+  private readonly setId: string
+
+  constructor(private readonly flagSchema: T) {
+    this.setId = crypto.randomUUID()
+  }
+
+  defaults(): FlagValues<T> {
+    return Object.keys(this.flagSchema).reduce((acc, key) => {
+      const typedKey = key as keyof T
+      acc[typedKey] = this.flagSchema[key].defaultValue
+      return acc
+    }, {} as FlagValues<T>)
+  }
+
+  isFlagName(name: string | number | symbol): name is keyof T {
+    return this.flagSchema[name as keyof T] !== undefined
+  }
+
+  async get<K extends keyof T>(
+    key: K,
+    ctx?: UserCtx
+  ): Promise<FlagValues<T>[K]> {
+    const flags = await this.fetch(ctx)
+    return flags[key]
+  }
+
+  async isEnabled<K extends KeysOfType<T, boolean>>(
+    key: K,
+    ctx?: UserCtx
+  ): Promise<boolean> {
+    const flags = await this.fetch(ctx)
+    return flags[key]
+  }
+
+  async fetch(ctx?: UserCtx): Promise<FlagValues<T>> {
+    return await tracer.trace("features.fetch", async span => {
+      const cachedFlags = context.getFeatureFlags<FlagValues<T>>(this.setId)
+      if (cachedFlags) {
+        span?.addTags({ fromCache: true })
+        return cachedFlags
+      }
+
+      const tags: Record<string, any> = {}
+      const flagValues = this.defaults()
+      const currentTenantId = context.getTenantId()
+      const specificallySetFalse = new Set<string>()
+
+      for (const { tenantId, key, value } of parseEnvFlags(
+        env.TENANT_FEATURE_FLAGS || ""
+      )) {
+        if (!tenantId || (tenantId !== "*" && tenantId !== currentTenantId)) {
+          continue
+        }
+
+        tags[`readFromEnvironmentVars`] = true
+
+        if (value === false) {
+          specificallySetFalse.add(key)
+        }
+
+        // ignore unknown flags
+        if (!this.isFlagName(key)) {
+          continue
+        }
+
+        if (typeof flagValues[key] !== "boolean") {
+          throw new Error(`Feature: ${key} is not a boolean`)
+        }
+
+        // @ts-expect-error - TS does not like you writing into a generic type,
+        // but we know that it's okay in this case because it's just an object.
+        flagValues[key as keyof FlagValues] = value
+        tags[`flags.${key}.source`] = "environment"
+      }
+
+      const license = ctx?.user?.license
+      if (license) {
+        tags[`readFromLicense`] = true
+
+        for (const feature of license.features) {
+          if (!this.isFlagName(feature)) {
+            continue
+          }
+
+          if (
+            flagValues[feature] === true ||
+            specificallySetFalse.has(feature)
+          ) {
+            // If the flag is already set to through environment variables, we
+            // don't want to override it back to false here.
+            continue
+          }
+
+          // @ts-expect-error - TS does not like you writing into a generic type,
+          // but we know that it's okay in this case because it's just an object.
+          flagValues[feature] = true
+          tags[`flags.${feature}.source`] = "license"
+        }
+      }
+
+      const identity = context.getIdentity()
+      tags[`identity.type`] = identity?.type
+      tags[`identity.tenantId`] = identity?.tenantId
+      tags[`identity._id`] = identity?._id
+
+      if (posthog && identity?.type === IdentityType.USER) {
+        tags[`readFromPostHog`] = true
+
+        const personProperties: Record<string, string> = {}
+        if (identity.tenantId) {
+          personProperties.tenantId = identity.tenantId
+        }
+
+        const posthogFlags = await posthog.getAllFlagsAndPayloads(
+          identity._id,
+          {
+            personProperties,
+          }
+        )
+
+        for (const [name, value] of Object.entries(posthogFlags.featureFlags)) {
+          if (!this.isFlagName(name)) {
+            // We don't want an unexpected PostHog flag to break the app, so we
+            // just log it and continue.
+            console.warn(`Unexpected posthog flag "${name}": ${value}`)
+            continue
+          }
+
+          if (flagValues[name] === true || specificallySetFalse.has(name)) {
+            // If the flag is already set to through environment variables, we
+            // don't want to override it back to false here.
+            continue
+          }
+
+          const payload = posthogFlags.featureFlagPayloads?.[name]
+          const flag = this.flagSchema[name]
+          try {
+            // @ts-expect-error - TS does not like you writing into a generic
+            // type, but we know that it's okay in this case because it's just
+            // an object.
+            flagValues[name] = flag.parse(payload || value)
+            tags[`flags.${name}.source`] = "posthog"
+          } catch (err) {
+            // We don't want an invalid PostHog flag to break the app, so we just
+            // log it and continue.
+            console.warn(`Error parsing posthog flag "${name}": ${value}`, err)
+          }
+        }
+      }
+
+      context.setFeatureFlags(this.setId, flagValues)
+      for (const [key, value] of Object.entries(flagValues)) {
+        tags[`flags.${key}.value`] = value
+      }
+      span?.addTags(tags)
+
+      return flagValues
+    })
+  }
+}
+
+// This is the primary source of truth for feature flags. If you want to add a
+// new flag, add it here and use the `fetch` and `get` functions to access it.
+// All of the machinery in this file is to make sure that flags have their
+// default values set correctly and their types flow through the system.
+export const flags = new FlagSet({
+  DEFAULT_VALUES: Flag.boolean(env.isDev()),
+  AUTOMATION_BRANCHING: Flag.boolean(env.isDev()),
+  SQS: Flag.boolean(env.isDev()),
+  [FeatureFlag.AI_CUSTOM_CONFIGS]: Flag.boolean(env.isDev()),
+  [FeatureFlag.ENRICHED_RELATIONSHIPS]: Flag.boolean(env.isDev()),
+})
+
+type UnwrapPromise<T> = T extends Promise<infer U> ? U : T
+export type FeatureFlags = UnwrapPromise<ReturnType<typeof flags.fetch>>