From adad73a9e2210ed0986d70eab5b5a55f377216d5 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 9 Oct 2024 13:10:52 +0100
Subject: [PATCH] Fix tests.

---
 .../backend-core/src/features/features.ts     |  5 ++-
 .../src/features/tests/features.spec.ts       | 43 +++++--------------
 packages/backend-core/src/middleware/ip.ts    |  2 +-
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/packages/backend-core/src/features/features.ts b/packages/backend-core/src/features/features.ts
index 5f2ba50f67..efe6495cb5 100644
--- a/packages/backend-core/src/features/features.ts
+++ b/packages/backend-core/src/features/features.ts
@@ -197,7 +197,10 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
 
       let userId = identity?._id
       if (!userId) {
-        userId = context.getIP()
+        const ip = context.getIP()
+        if (ip) {
+          userId = crypto.createHash("sha512").update(ip).digest("hex")
+        }
       }
 
       let tenantId = identity?.tenantId
diff --git a/packages/backend-core/src/features/tests/features.spec.ts b/packages/backend-core/src/features/tests/features.spec.ts
index bf01ad67f3..664490dcda 100644
--- a/packages/backend-core/src/features/tests/features.spec.ts
+++ b/packages/backend-core/src/features/tests/features.spec.ts
@@ -18,7 +18,6 @@ interface TestCase {
   identity?: Partial<IdentityContext>
   environmentFlags?: string
   posthogFlags?: PostHogFlags
-  licenseFlags?: Array<string>
   expected?: Partial<FlagValues<typeof schema>>
   errorMessage?: string | RegExp
 }
@@ -117,17 +116,6 @@ describe("feature flags", () => {
       },
       expected: { TEST_BOOLEAN: true },
     },
-    {
-      it: "should be able to set boolean flags through the license",
-      licenseFlags: ["TEST_BOOLEAN"],
-      expected: { TEST_BOOLEAN: true },
-    },
-    {
-      it: "should not be able to override a negative environment flag from license",
-      environmentFlags: "default:!TEST_BOOLEAN",
-      licenseFlags: ["TEST_BOOLEAN"],
-      expected: { TEST_BOOLEAN: false },
-    },
     {
       it: "should not error on unrecognised PostHog flag",
       posthogFlags: {
@@ -135,18 +123,12 @@ describe("feature flags", () => {
       },
       expected: flags.defaults(),
     },
-    {
-      it: "should not error on unrecognised license flag",
-      licenseFlags: ["UNDEFINED"],
-      expected: flags.defaults(),
-    },
   ])(
     "$it",
     async ({
       identity,
       environmentFlags,
       posthogFlags,
-      licenseFlags,
       expected,
       errorMessage,
     }) => {
@@ -162,8 +144,6 @@ describe("feature flags", () => {
         env.POSTHOG_API_HOST = "https://us.i.posthog.com"
       }
 
-      const ctx = { user: { license: { features: licenseFlags || [] } } }
-
       await withEnv(env, async () => {
         // We need to pass in node-fetch here otherwise nock won't get used
         // because posthog-node uses axios under the hood.
@@ -185,18 +165,13 @@ describe("feature flags", () => {
 
         await context.doInIdentityContext(fullIdentity, async () => {
           if (errorMessage) {
-            await expect(flags.fetch(ctx as UserCtx)).rejects.toThrow(
-              errorMessage
-            )
+            await expect(flags.fetch()).rejects.toThrow(errorMessage)
           } else if (expected) {
-            const values = await flags.fetch(ctx as UserCtx)
+            const values = await flags.fetch()
             expect(values).toMatchObject(expected)
 
             for (const [key, expectedValue] of Object.entries(expected)) {
-              const value = await flags.get(
-                key as keyof typeof schema,
-                ctx as UserCtx
-              )
+              const value = await flags.get(key as keyof typeof schema)
               expect(value).toBe(expectedValue)
             }
           } else {
@@ -252,8 +227,8 @@ describe("feature flags", () => {
       POSTHOG_TOKEN: "test",
     }
 
-    const ctx = { ip: "127.0.0.1" } as UserCtx
-    const hashedIp = crypto.createHash("sha512").update(ctx.ip).digest("hex")
+    const ip = "127.0.0.1"
+    const hashedIp = crypto.createHash("sha512").update(ip).digest("hex")
 
     await withEnv(env, async () => {
       mockPosthogFlags(
@@ -273,9 +248,11 @@ describe("feature flags", () => {
         },
       })
 
-      await context.doInTenant("default", async () => {
-        const result = await flags.fetch(ctx)
-        expect(result.TEST_BOOLEAN).toBe(true)
+      await context.doInIPContext(ip, async () => {
+        await context.doInTenant("default", async () => {
+          const result = await flags.fetch()
+          expect(result.TEST_BOOLEAN).toBe(true)
+        })
       })
 
       shutdown()
diff --git a/packages/backend-core/src/middleware/ip.ts b/packages/backend-core/src/middleware/ip.ts
index 69a0a2da38..940f644ad6 100644
--- a/packages/backend-core/src/middleware/ip.ts
+++ b/packages/backend-core/src/middleware/ip.ts
@@ -3,7 +3,7 @@ import { doInIPContext } from "../context"
 
 export default async (ctx: Ctx, next: any) => {
   if (ctx.ip) {
-    doInIPContext(ctx.ip, () => {
+    return await doInIPContext(ctx.ip, () => {
       return next()
     })
   } else {