From b94546b1a1ebab927ce8b1ed85697e565f4bf714 Mon Sep 17 00:00:00 2001
From: Adria Navarro Redo <adria@budibase.com>
Date: Thu, 26 Jan 2023 15:16:42 +0000
Subject: [PATCH] Fix user test

---
 packages/backend-core/src/cache/user.ts       |  4 ++--
 packages/server/jest.config.ts                |  1 -
 .../src/tests/utilities/TestConfiguration.ts  | 21 ++++++++++++-------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/backend-core/src/cache/user.ts b/packages/backend-core/src/cache/user.ts
index 6cc80da07d..9236d843fd 100644
--- a/packages/backend-core/src/cache/user.ts
+++ b/packages/backend-core/src/cache/user.ts
@@ -62,8 +62,8 @@ export async function getUser(
   return user
 }
 
-export async function invalidateUser(userId: string) {
-  const tenantId = getTenantId()
+export async function invalidateUser(userId: string, tenantId?: string) {
+  tenantId = tenantId || getTenantId()
   const cacheKey = getCacheKey(tenantId, userId)
   const client = await redis.getUserClient()
   await client.delete(cacheKey)
diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index a55044a3dd..c856057920 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -44,7 +44,6 @@ const config: Config = {
     },
     {
       ...configSettings,
-      displayName: "parallel test",
       testMatch: ["<rootDir>/**/!(*.seq).spec.[jt]s"],
     },
   ],
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index d1dba3d2f3..503066ea7e 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -177,24 +177,24 @@ class TestConfiguration {
   }
 
   // MODES
-  setMultiTenancy = (value: boolean) => {
+  #setMultiTenancy = (value: boolean) => {
     env._set("MULTI_TENANCY", value)
     coreEnv._set("MULTI_TENANCY", value)
   }
 
-  setSelfHosted = (value: boolean) => {
+  #setSelfHosted = (value: boolean) => {
     env._set("SELF_HOSTED", value)
     coreEnv._set("SELF_HOSTED", value)
   }
 
   modeCloud = () => {
-    this.setSelfHosted(false)
-    this.setMultiTenancy(true)
+    this.#setSelfHosted(false)
+    this.#setMultiTenancy(true)
   }
 
   modeSelf = () => {
-    this.setSelfHosted(true)
-    this.setMultiTenancy(false)
+    this.#setSelfHosted(true)
+    this.#setMultiTenancy(false)
   }
 
   // UTILS
@@ -288,7 +288,7 @@ class TestConfiguration {
       admin,
       roles,
     })
-    await cache.user.invalidateUser(globalId)
+    await cache.user.invalidateUser(globalId, this.getTenantId())
     return {
       ...resp,
       globalId,
@@ -328,7 +328,7 @@ class TestConfiguration {
       const appToken = auth.jwt.sign(app, env.JWT_SECRET)
 
       // returning necessary request headers
-      await cache.user.invalidateUser(userId)
+      await cache.user.invalidateUser(userId, this.getTenantId())
       return {
         Accept: "application/json",
         Cookie: [
@@ -384,6 +384,11 @@ class TestConfiguration {
     if (appId) {
       headers[constants.Header.APP_ID] = appId
     }
+
+    if (this.tenantId) {
+      headers[constants.Header.TENANT_ID] = this.tenantId
+    }
+
     return headers
   }