From 9feb91793caf3fcad991533fcb0d42ae9da8bc46 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 3 Jan 2024 12:38:31 +0000
Subject: [PATCH 1/2] Fix for multi-tenancy issue in local development,
 couldn't load apps as it requires a tenant ID in the subdomain when in
 multi-tenancy mode which isn't possible in development - this makes sure that
 local development can work by using the users cookie instead.

---
 packages/backend-core/src/context/mainContext.ts | 2 +-
 packages/backend-core/src/tenancy/tenancy.ts     | 4 ++--
 packages/backend-core/src/utils/utils.ts         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index e439eb5fd0..36fd5dcb48 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -134,7 +134,7 @@ export async function doInContext(appId: string, task: any): Promise<any> {
 }
 
 export async function doInTenant<T>(
-  tenantId: string | null,
+  tenantId: string | undefined,
   task: () => T
 ): Promise<T> {
   // make sure default always selected in single tenancy
diff --git a/packages/backend-core/src/tenancy/tenancy.ts b/packages/backend-core/src/tenancy/tenancy.ts
index 3603ef3462..8835960ca5 100644
--- a/packages/backend-core/src/tenancy/tenancy.ts
+++ b/packages/backend-core/src/tenancy/tenancy.ts
@@ -39,7 +39,7 @@ const ALL_STRATEGIES = Object.values(TenantResolutionStrategy)
 export const getTenantIDFromCtx = (
   ctx: BBContext,
   opts: GetTenantIdOptions
-): string | null => {
+): string | undefined => {
   // exit early if not multi-tenant
   if (!isMultiTenant()) {
     return DEFAULT_TENANT_ID
@@ -144,5 +144,5 @@ export const getTenantIDFromCtx = (
     ctx.throw(403, "Tenant id not set")
   }
 
-  return null
+  return undefined
 }
diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts
index 0554737518..30cf55b149 100644
--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@@ -31,8 +31,8 @@ export async function resolveAppUrl(ctx: Ctx) {
   const appUrl = ctx.path.split("/")[2]
   let possibleAppUrl = `/${appUrl.toLowerCase()}`
 
-  let tenantId: string | null = context.getTenantId()
-  if (env.MULTI_TENANCY) {
+  let tenantId: string | undefined = context.getTenantId()
+  if (!env.isDev() && env.MULTI_TENANCY) {
     // always use the tenant id from the subdomain in multi tenancy
     // this ensures the logged-in user tenant id doesn't overwrite
     // e.g. in the case of viewing a public app while already logged-in to another tenant
@@ -41,7 +41,7 @@ export async function resolveAppUrl(ctx: Ctx) {
     })
   }
 
-  // search prod apps for a url that matches
+  // search prod apps for an url that matches
   const apps: App[] = await context.doInTenant(
     tenantId,
     () => getAllApps({ dev: false }) as Promise<App[]>

From 9a5fb8b8dec584b6155fbfb81812832bbc86e1ae Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 3 Jan 2024 12:56:53 +0000
Subject: [PATCH 2/2] Fix test.

---
 packages/backend-core/src/tenancy/tests/tenancy.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend-core/src/tenancy/tests/tenancy.spec.ts b/packages/backend-core/src/tenancy/tests/tenancy.spec.ts
index ebeaca074c..95dd76a6dd 100644
--- a/packages/backend-core/src/tenancy/tests/tenancy.spec.ts
+++ b/packages/backend-core/src/tenancy/tests/tenancy.spec.ts
@@ -157,12 +157,12 @@ describe("getTenantIDFromCtx", () => {
           TenantResolutionStrategy.PATH,
         ],
       }
-      expect(getTenantIDFromCtx(ctx, mockOpts)).toBeNull()
+      expect(getTenantIDFromCtx(ctx, mockOpts)).toBeUndefined()
       expect(ctx.throw).toBeCalledTimes(1)
       expect(ctx.throw).toBeCalledWith(403, "Tenant id not set")
     })
 
-    it("returns null if allowNoTenant is true", () => {
+    it("returns undefined if allowNoTenant is true", () => {
       const ctx = createCtx({})
       mockOpts = {
         allowNoTenant: true,
@@ -172,7 +172,7 @@ describe("getTenantIDFromCtx", () => {
           TenantResolutionStrategy.PATH,
         ],
       }
-      expect(getTenantIDFromCtx(ctx, mockOpts)).toBeNull()
+      expect(getTenantIDFromCtx(ctx, mockOpts)).toBeUndefined()
     })
   })