From e25429632b9d9e306f9e3b5d6287936c725d9882 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 15:35:55 +0100
Subject: [PATCH 01/19] Remove users that should not be there anymore when
 syncGlobalUsers

---
 packages/server/src/sdk/users/utils.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts
index 5c369754a1..82a46acfac 100644
--- a/packages/server/src/sdk/users/utils.ts
+++ b/packages/server/src/sdk/users/utils.ts
@@ -6,25 +6,33 @@ import {
   InternalTables,
 } from "../../db/utils"
 import { isEqual } from "lodash"
+import { ContextUser, UserMetadata } from "@budibase/types"
 
-export function combineMetadataAndUser(user: any, metadata: any) {
+export function combineMetadataAndUser(
+  user: ContextUser,
+  metadata: UserMetadata | UserMetadata[]
+) {
+  const metadataId = generateUserMetadataID(user._id!)
+  const found = Array.isArray(metadata)
+    ? metadata.find(doc => doc._id === metadataId)
+    : metadata
   // skip users with no access
   if (
     user.roleId == null ||
     user.roleId === rolesCore.BUILTIN_ROLE_IDS.PUBLIC
   ) {
+    // If it exists and it should not, we must remove it
+    if (found) {
+      return { ...found, _deleted: true }
+    }
     return null
   }
   delete user._rev
-  const metadataId = generateUserMetadataID(user._id)
   const newDoc = {
     ...user,
     _id: metadataId,
     tableId: InternalTables.USER_METADATA,
   }
-  const found = Array.isArray(metadata)
-    ? metadata.find(doc => doc._id === metadataId)
-    : metadata
   // copy rev over for the purposes of equality check
   if (found) {
     newDoc._rev = found._rev
@@ -58,7 +66,7 @@ export async function syncGlobalUsers() {
   ])
   const toWrite = []
   for (let user of users) {
-    const combined = await combineMetadataAndUser(user, metadata)
+    const combined = combineMetadataAndUser(user, metadata)
     if (combined) {
       toWrite.push(combined)
     }

From b368c143087a8d8068212cd2368c001eeb3be023 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 16:18:32 +0100
Subject: [PATCH 02/19] Add unit tests to test new users

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 packages/server/src/sdk/users/tests/utils.spec.ts

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
new file mode 100644
index 0000000000..3178978c46
--- /dev/null
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -0,0 +1,49 @@
+import { db } from "@budibase/backend-core"
+import TestConfiguration from "../../../tests/utilities/TestConfiguration"
+import { rawUserMetadata, syncGlobalUsers } from "../utils"
+
+describe("syncGlobalUsers", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  it("the default user is synced", async () => {
+    await config.doInContext(config.appId, async () => {
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(1)
+      expect(metadata).toEqual([
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(config.user._id),
+        }),
+      ])
+    })
+  })
+
+  it("app users are synced", async () => {
+    await config.doInContext(config.appId, async () => {
+      const user1 = await config.createUser()
+      const user2 = await config.createUser()
+
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(3)
+      expect(metadata).toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user1._id),
+        })
+      )
+      expect(metadata).toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user2._id),
+        })
+      )
+    })
+  })
+})

From 8783f0123d51f0b95490151004c59458eb33d2fe Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 16:42:31 +0100
Subject: [PATCH 03/19] Add tests for admins vs app users

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 3178978c46..8eba6db5b6 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -5,7 +5,7 @@ import { rawUserMetadata, syncGlobalUsers } from "../utils"
 describe("syncGlobalUsers", () => {
   const config = new TestConfiguration()
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 
@@ -25,11 +25,10 @@ describe("syncGlobalUsers", () => {
     })
   })
 
-  it("app users are synced", async () => {
+  it("admin and builders users are synced", async () => {
+    const user1 = await config.createUser({ admin: true })
+    const user2 = await config.createUser({ admin: false, builder: true })
     await config.doInContext(config.appId, async () => {
-      const user1 = await config.createUser()
-      const user2 = await config.createUser()
-
       await syncGlobalUsers()
 
       const metadata = await rawUserMetadata()
@@ -46,4 +45,19 @@ describe("syncGlobalUsers", () => {
       )
     })
   })
+
+  it("app users are not synced if not specified", async () => {
+    const user = await config.createUser({ admin: false, builder: false })
+    await config.doInContext(config.appId, async () => {
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(1)
+      expect(metadata).not.toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user._id),
+        })
+      )
+    })
+  })
 })

From 4cb6b99982e6f651d4a9380954f323cf1ee96518 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 16:42:55 +0100
Subject: [PATCH 04/19] Types

---
 packages/server/src/tests/utilities/TestConfiguration.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index cf337c689f..3e0ea331b8 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -47,6 +47,7 @@ import {
   SourceName,
   Table,
   SearchFilters,
+  UserRoles,
 } from "@budibase/types"
 
 type DefaultUserValues = {
@@ -277,7 +278,7 @@ class TestConfiguration {
       email?: string
       builder?: boolean
       admin?: boolean
-      roles?: any
+      roles?: UserRoles
     } = {}
   ) {
     let { id, firstName, lastName, email, builder, admin, roles } = user

From efff31e181c1b4afb48b58c031b8225451d6ad6a Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 17:02:56 +0100
Subject: [PATCH 05/19] Test user groups

---
 .../tests/utilities/structures/index.ts       |  1 +
 .../tests/utilities/structures/userGroups.ts  | 10 +++++
 .../server/src/sdk/users/tests/utils.spec.ts  | 39 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend-core/tests/utilities/structures/userGroups.ts

diff --git a/packages/backend-core/tests/utilities/structures/index.ts b/packages/backend-core/tests/utilities/structures/index.ts
index ca77f476d0..ff2e5b147f 100644
--- a/packages/backend-core/tests/utilities/structures/index.ts
+++ b/packages/backend-core/tests/utilities/structures/index.ts
@@ -8,4 +8,5 @@ export * as plugins from "./plugins"
 export * as sso from "./sso"
 export * as tenant from "./tenants"
 export * as users from "./users"
+export * as userGroups from "./userGroups"
 export { generator } from "./generator"
diff --git a/packages/backend-core/tests/utilities/structures/userGroups.ts b/packages/backend-core/tests/utilities/structures/userGroups.ts
new file mode 100644
index 0000000000..4dc870a00a
--- /dev/null
+++ b/packages/backend-core/tests/utilities/structures/userGroups.ts
@@ -0,0 +1,10 @@
+import { UserGroup } from "@budibase/types"
+import { generator } from "./generator"
+
+export function userGroup(): UserGroup {
+  return {
+    name: generator.word(),
+    icon: generator.word(),
+    color: generator.word(),
+  }
+}
diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 8eba6db5b6..97381a2628 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -1,4 +1,7 @@
-import { db } from "@budibase/backend-core"
+import { db, roles } from "@budibase/backend-core"
+import { structures } from "@budibase/backend-core/tests"
+import { sdk as proSdk } from "@budibase/pro"
+
 import TestConfiguration from "../../../tests/utilities/TestConfiguration"
 import { rawUserMetadata, syncGlobalUsers } from "../utils"
 
@@ -60,4 +63,38 @@ describe("syncGlobalUsers", () => {
       )
     })
   })
+
+  it("app users are removed when removed from the tenant", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(1)
+
+        await proSdk.groups.updateGroupApps(group.id, {
+          appsToAdd: [
+            { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+          ],
+        })
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(3)
+        expect(metadata).toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user1._id),
+          })
+        )
+        expect(metadata).toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user2._id),
+          })
+        )
+      })
+    })
+  })
 })

From 301ad598ada0e94d05e678d56ba74c933e21c51a Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 17:05:32 +0100
Subject: [PATCH 06/19] Test user group deletion

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 97381a2628..69f1bdf9e6 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -64,7 +64,7 @@ describe("syncGlobalUsers", () => {
     })
   })
 
-  it("app users are removed when removed from the tenant", async () => {
+  it("app users are added when group is assigned to app", async () => {
     await config.doInTenant(async () => {
       const group = await proSdk.groups.save(structures.userGroups.userGroup())
       const user1 = await config.createUser({ admin: false, builder: false })
@@ -97,4 +97,31 @@ describe("syncGlobalUsers", () => {
       })
     })
   })
+
+  it("app users are removed when user removed from user group", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.updateGroupApps(group.id, {
+        appsToAdd: [
+          { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+        ],
+      })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(3)
+
+        await proSdk.groups.updateGroupApps(group.id, {
+          appsToRemove: [{ appId: config.prodAppId! }],
+        })
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(1)
+      })
+    })
+  })
 })

From b8fe9671b126d6e2f7579c1c70a23fefec8e725e Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 15:12:40 +0100
Subject: [PATCH 07/19] Rename test

---
 packages/server/src/sdk/users/tests/utils.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 69f1bdf9e6..a31f66752e 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -98,7 +98,7 @@ describe("syncGlobalUsers", () => {
     })
   })
 
-  it("app users are removed when user removed from user group", async () => {
+  it("app users are removed when app is removed from user group", async () => {
     await config.doInTenant(async () => {
       const group = await proSdk.groups.save(structures.userGroups.userGroup())
       const user1 = await config.createUser({ admin: false, builder: false })

From 2dd8b078e577d1ddde66c9a056daeb1391f3b639 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 15:14:16 +0100
Subject: [PATCH 08/19] Test removing users from group

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index a31f66752e..d5d43a0c04 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -124,4 +124,35 @@ describe("syncGlobalUsers", () => {
       })
     })
   })
+
+  it("app users are removed when app is removed from user group", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.updateGroupApps(group.id, {
+        appsToAdd: [
+          { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+        ],
+      })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(3)
+
+        await proSdk.groups.removeUsers(group.id, [user1._id])
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(2)
+
+        expect(metadata).not.toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user1._id),
+          })
+        )
+      })
+    })
+  })
 })

From 8e8f4ac02d55d3d33bb10601ae96d390b4858333 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 15:16:45 +0100
Subject: [PATCH 09/19] Add extra assertion

---
 packages/server/src/sdk/users/tests/utils.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index d5d43a0c04..11c2c53643 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -32,6 +32,7 @@ describe("syncGlobalUsers", () => {
     const user1 = await config.createUser({ admin: true })
     const user2 = await config.createUser({ admin: false, builder: true })
     await config.doInContext(config.appId, async () => {
+      expect(await rawUserMetadata()).toHaveLength(1)
       await syncGlobalUsers()
 
       const metadata = await rawUserMetadata()

From 48b964378b950281b86a7582c8698a336439b1c8 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 13:11:42 +0100
Subject: [PATCH 10/19] Remove all app cookie references (not really needed
 anymore)

---
 packages/backend-core/src/auth/auth.ts        |  1 -
 packages/backend-core/src/constants/misc.ts   |  1 -
 packages/server/src/middleware/currentapp.ts  | 31 +------------------
 .../src/tests/utilities/TestConfiguration.ts  | 21 ++-----------
 .../worker/src/api/controllers/global/auth.ts |  5 ---
 .../worker/src/api/controllers/global/self.ts | 15 +--------
 6 files changed, 5 insertions(+), 69 deletions(-)

diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 26c7cd4e26..fb2fd2cf51 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -199,7 +199,6 @@ export async function platformLogout(opts: PlatformLogoutOpts) {
   } else {
     // clear cookies
     clearCookie(ctx, Cookie.Auth)
-    clearCookie(ctx, Cookie.CurrentApp)
   }
 
   const sessionIds = sessions.map(({ sessionId }) => sessionId)
diff --git a/packages/backend-core/src/constants/misc.ts b/packages/backend-core/src/constants/misc.ts
index e25c90575f..15cec7a6b9 100644
--- a/packages/backend-core/src/constants/misc.ts
+++ b/packages/backend-core/src/constants/misc.ts
@@ -4,7 +4,6 @@ export enum UserStatus {
 }
 
 export enum Cookie {
-  CurrentApp = "budibase:currentapp",
   Auth = "budibase:auth",
   Init = "budibase:init",
   ACCOUNT_RETURN_URL = "budibase:account:returnurl",
diff --git a/packages/server/src/middleware/currentapp.ts b/packages/server/src/middleware/currentapp.ts
index 7621bf61ee..efafc59e21 100644
--- a/packages/server/src/middleware/currentapp.ts
+++ b/packages/server/src/middleware/currentapp.ts
@@ -2,7 +2,6 @@ import {
   utils,
   constants,
   roles,
-  db as dbCore,
   tenancy,
   context,
 } from "@budibase/backend-core"
@@ -15,29 +14,10 @@ import { UserCtx } from "@budibase/types"
 export default async (ctx: UserCtx, next: any) => {
   // try to get the appID from the request
   let requestAppId = await utils.getAppIdFromCtx(ctx)
-  // get app cookie if it exists
-  let appCookie: { appId?: string } | undefined
-  try {
-    appCookie = utils.getCookie(ctx, constants.Cookie.CurrentApp)
-  } catch (err) {
-    utils.clearCookie(ctx, constants.Cookie.CurrentApp)
-  }
-  if (!appCookie && !requestAppId) {
+  if (!requestAppId) {
     return next()
   }
 
-  // check the app exists referenced in cookie
-  if (appCookie) {
-    const appId = appCookie.appId
-    const exists = await dbCore.dbExists(appId)
-    if (!exists) {
-      utils.clearCookie(ctx, constants.Cookie.CurrentApp)
-      return next()
-    }
-    // if the request app ID wasn't set, update it with the cookie
-    requestAppId = requestAppId || appId
-  }
-
   // deny access to application preview
   if (!env.isTest()) {
     if (
@@ -45,7 +25,6 @@ export default async (ctx: UserCtx, next: any) => {
       !isWebhookEndpoint(ctx) &&
       (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)
     ) {
-      utils.clearCookie(ctx, constants.Cookie.CurrentApp)
       return ctx.redirect("/")
     }
   }
@@ -127,14 +106,6 @@ export default async (ctx: UserCtx, next: any) => {
         role: await roles.getRole(roleId),
       }
     }
-    if (
-      (requestAppId !== appId ||
-        appCookie == null ||
-        appCookie.appId !== requestAppId) &&
-      !skipCookie
-    ) {
-      utils.setCookie(ctx, { appId }, constants.Cookie.CurrentApp)
-    }
 
     return next()
   })
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index cf337c689f..f5009e95a8 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -330,21 +330,13 @@ class TestConfiguration {
         sessionId: "sessionid",
         tenantId: this.getTenantId(),
       }
-      const app = {
-        roleId: roleId,
-        appId,
-      }
       const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET)
-      const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET)
 
       // returning necessary request headers
       await cache.user.invalidateUser(userId)
       return {
         Accept: "application/json",
-        Cookie: [
-          `${constants.Cookie.Auth}=${authToken}`,
-          `${constants.Cookie.CurrentApp}=${appToken}`,
-        ],
+        Cookie: [`${constants.Cookie.Auth}=${authToken}`],
         [constants.Header.APP_ID]: appId,
       }
     })
@@ -359,18 +351,11 @@ class TestConfiguration {
       sessionId: "sessionid",
       tenantId,
     }
-    const app = {
-      roleId: roles.BUILTIN_ROLE_IDS.ADMIN,
-      appId: this.appId,
-    }
     const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET)
-    const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET)
+
     const headers: any = {
       Accept: "application/json",
-      Cookie: [
-        `${constants.Cookie.Auth}=${authToken}`,
-        `${constants.Cookie.CurrentApp}=${appToken}`,
-      ],
+      Cookie: [`${constants.Cookie.Auth}=${authToken}`],
       [constants.Header.CSRF_TOKEN]: this.defaultUserValues.csrfToken,
       Host: this.tenantHost(),
       ...extras,
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 1286fd519d..c8f75b3610 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -50,11 +50,6 @@ async function passportCallback(
   setCookie(ctx, token, Cookie.Auth, { sign: false })
   // set the token in a header as well for APIs
   ctx.set(Header.TOKEN, token)
-  // get rid of any app cookies on login
-  // have to check test because this breaks cypress
-  if (!env.isTest()) {
-    clearCookie(ctx, Cookie.CurrentApp)
-  }
 }
 
 export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts
index 78e5bf7164..d0232bee60 100644
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@@ -2,7 +2,6 @@ import * as userSdk from "../../../sdk/users"
 import {
   featureFlags,
   tenancy,
-  constants,
   db as dbCore,
   utils,
   encryption,
@@ -11,7 +10,7 @@ import {
 import env from "../../../environment"
 import { groups } from "@budibase/pro"
 import { UpdateSelfRequest, UpdateSelfResponse, UserCtx } from "@budibase/types"
-const { getCookie, clearCookie, newid } = utils
+const { newid } = utils
 
 function newTestApiKey() {
   return env.ENCRYPTED_TEST_PUBLIC_API_KEY
@@ -71,16 +70,6 @@ export async function fetchAPIKey(ctx: any) {
   ctx.body = cleanupDevInfo(devInfo)
 }
 
-const checkCurrentApp = (ctx: any) => {
-  const appCookie = getCookie(ctx, constants.Cookie.CurrentApp)
-  if (appCookie && !tenancy.isUserInAppTenant(appCookie.appId)) {
-    // there is a currentapp cookie from another tenant
-    // remove the cookie as this is incompatible with the builder
-    // due to builder and admin permissions being removed
-    clearCookie(ctx, constants.Cookie.CurrentApp)
-  }
-}
-
 /**
  * Add the attributes that are session based to the current user.
  */
@@ -101,8 +90,6 @@ export async function getSelf(ctx: any) {
     id: userId,
   }
 
-  checkCurrentApp(ctx)
-
   // get the main body of the user
   const user = await userSdk.getUser(userId)
   ctx.body = await groups.enrichUserRolesFromGroups(user)

From 6a257bf9c35c50e87ad6829f2af0d4c0c1ddc604 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 14:53:49 +0100
Subject: [PATCH 11/19] Tweak tests

---
 .../src/middleware/tests/currentapp.spec.js   | 48 +++----------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/packages/server/src/middleware/tests/currentapp.spec.js b/packages/server/src/middleware/tests/currentapp.spec.js
index 8770118da2..b80800fd96 100644
--- a/packages/server/src/middleware/tests/currentapp.spec.js
+++ b/packages/server/src/middleware/tests/currentapp.spec.js
@@ -158,27 +158,22 @@ describe("Current app middleware", () => {
   })
 
   describe("check functionality when logged in", () => {
-    async function checkExpected(setCookie) {
+    async function checkExpected() {
       config.setUser()
       await config.executeMiddleware()
-      let { utils } = require("@budibase/backend-core")
-      if (setCookie) {
-        expect(utils.setCookie).toHaveBeenCalled()
-      } else {
-        expect(utils.setCookie).not.toHaveBeenCalled()
-      }
+
       expect(config.ctx.roleId).toEqual("PUBLIC")
       expect(config.ctx.user.role._id).toEqual("PUBLIC")
       expect(config.ctx.appId).toEqual("app_test")
       expect(config.next).toHaveBeenCalled()
     }
 
-    it("should be able to setup an app token when cookie not setup", async () => {
+    it("should be able to setup an app token on a first call", async () => {
       mockAuthWithCookie()
-      await checkExpected(true)
+      await checkExpected()
     })
 
-    it("should perform correct when no cookie exists", async () => {
+    it("should perform correct on a first call", async () => {
       mockReset()
       jest.mock("@budibase/backend-core", () => {
         const core = jest.requireActual("@budibase/backend-core")
@@ -206,38 +201,7 @@ describe("Current app middleware", () => {
           },
         }
       })
-      await checkExpected(true)
-    })
-
-    it("lastly check what occurs when cookie doesn't need updated", async () => {
-      mockReset()
-      jest.mock("@budibase/backend-core", () => {
-        const core = jest.requireActual("@budibase/backend-core")
-        return {
-          ...core,
-          db: {
-            ...core.db,
-            dbExists: () => true,
-          },
-          utils: {
-            getAppIdFromCtx: () => {
-              return "app_test"
-            },
-            setCookie: jest.fn(),
-            getCookie: () => ({ appId: "app_test", roleId: "PUBLIC" }),
-          },
-          cache: {
-            user: {
-              getUser: async id => {
-                return {
-                  _id: "us_uuid1",
-                }
-              },
-            },
-          },
-        }
-      })
-      await checkExpected(false)
+      await checkExpected()
     })
   })
 })

From ec0acadd0a53a516929662693f3ab7aaa62a807b Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 31 Mar 2023 09:46:56 +0100
Subject: [PATCH 12/19] Fix user crossover on the bulder when no using account
 portal

---
 packages/builder/src/pages/builder/_layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index a2b480f742..b216958045 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -79,7 +79,7 @@
       }
 
       // Validate tenant if in a multi-tenant env
-      if (useAccountPortal && multiTenancyEnabled) {
+      if (multiTenancyEnabled) {
         await validateTenantId()
       }
     } catch (error) {

From faa1c27d293e6f21890020807835ddd9e9b77512 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 31 Mar 2023 10:53:50 +0100
Subject: [PATCH 13/19] Refresh sql columns on defining relationships

---
 .../components/backend/DataTable/DataTable.svelte   |  5 ++++-
 packages/builder/src/stores/backend/tables.js       | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 162240e12c..d315e68356 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -136,6 +136,7 @@
   const onUpdateColumns = () => {
     selectedRows = []
     fetch.refresh()
+    tables.fetchTable(id)
   }
 
   // Fetch data whenever rows are modified. Unfortunately we have to lose
@@ -148,8 +149,10 @@
   // When importing new rows it is better to reinitialise request/paging data.
   // Not doing so causes inconsistency in paging behaviour and content.
   const onImportData = () => {
-    fetch.getInitialData()
+    fetch.getInitialData(enrichedSchema)
   }
+
+  $: console.log(enrichedSchema)
 </script>
 
 <div>
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js
index ee38504dd1..3b7ce35dde 100644
--- a/packages/builder/src/stores/backend/tables.js
+++ b/packages/builder/src/stores/backend/tables.js
@@ -22,6 +22,18 @@ export function createTablesStore() {
     }))
   }
 
+  const fetchTable = async tableId => {
+    const table = await API.fetchTableDefinition(tableId)
+
+    store.update(state => {
+      const indexToUpdate = state.list.findIndex(t => t._id === table._id)
+      state.list[indexToUpdate] = table
+      return {
+        ...state,
+      }
+    })
+  }
+
   const select = tableId => {
     store.update(state => ({
       ...state,
@@ -126,6 +138,7 @@ export function createTablesStore() {
   return {
     subscribe: derivedStore.subscribe,
     fetch,
+    fetchTable,
     init: fetch,
     select,
     save,

From 4ca6982d279ae8ee8ea037a93b78b0c8adeb31d2 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 31 Mar 2023 11:25:51 +0100
Subject: [PATCH 14/19] Prevent double deletions

---
 packages/server/src/sdk/users/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts
index 82a46acfac..9b9ea04c56 100644
--- a/packages/server/src/sdk/users/utils.ts
+++ b/packages/server/src/sdk/users/utils.ts
@@ -22,7 +22,7 @@ export function combineMetadataAndUser(
     user.roleId === rolesCore.BUILTIN_ROLE_IDS.PUBLIC
   ) {
     // If it exists and it should not, we must remove it
-    if (found) {
+    if (found?._id) {
       return { ...found, _deleted: true }
     }
     return null

From 6f69798f2724aea7d84846a3f28ca50bc021e4ef Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 31 Mar 2023 11:27:44 +0100
Subject: [PATCH 15/19] Undo wrongly commited code

---
 .../builder/src/components/backend/DataTable/DataTable.svelte | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index d315e68356..0c5adfc18c 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -149,10 +149,8 @@
   // When importing new rows it is better to reinitialise request/paging data.
   // Not doing so causes inconsistency in paging behaviour and content.
   const onImportData = () => {
-    fetch.getInitialData(enrichedSchema)
+    fetch.getInitialData()
   }
-
-  $: console.log(enrichedSchema)
 </script>
 
 <div>

From 889ea356e660dc0d9b4c23dafc752a47f99ea31d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 10:43:16 +0000
Subject: [PATCH 16/19] v2.4.42-alpha.5

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  6 +++---
 packages/builder/package.json          | 12 ++++++------
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           | 12 ++++++------
 packages/frontend-core/package.json    |  6 +++---
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 12 ++++++------
 packages/shared-core/package.json      |  4 ++--
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 13 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/lerna.json b/lerna.json
index a6309f4420..7926e03ecb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index fd7a416125..e7c6217cee 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.4.42-alpha.4",
+    "@budibase/types": "2.4.42-alpha.5",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index e65f6eda98..b4c0241a49 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.4.42-alpha.4",
-    "@budibase/string-templates": "2.4.42-alpha.4",
+    "@budibase/shared-core": "2.4.42-alpha.5",
+    "@budibase/string-templates": "2.4.42-alpha.5",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b0ee045824..1e175eb757 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.4",
-    "@budibase/client": "2.4.42-alpha.4",
-    "@budibase/frontend-core": "2.4.42-alpha.4",
-    "@budibase/shared-core": "2.4.42-alpha.4",
-    "@budibase/string-templates": "2.4.42-alpha.4",
+    "@budibase/bbui": "2.4.42-alpha.5",
+    "@budibase/client": "2.4.42-alpha.5",
+    "@budibase/frontend-core": "2.4.42-alpha.5",
+    "@budibase/shared-core": "2.4.42-alpha.5",
+    "@budibase/string-templates": "2.4.42-alpha.5",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bb0b78b81d..8dc178342f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.4.42-alpha.4",
-    "@budibase/string-templates": "2.4.42-alpha.4",
-    "@budibase/types": "2.4.42-alpha.4",
+    "@budibase/backend-core": "2.4.42-alpha.5",
+    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/types": "2.4.42-alpha.5",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 2c57516046..b491cad175 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.4",
-    "@budibase/frontend-core": "2.4.42-alpha.4",
-    "@budibase/shared-core": "2.4.42-alpha.4",
-    "@budibase/string-templates": "2.4.42-alpha.4",
-    "@budibase/types": "2.4.42-alpha.4",
+    "@budibase/bbui": "2.4.42-alpha.5",
+    "@budibase/frontend-core": "2.4.42-alpha.5",
+    "@budibase/shared-core": "2.4.42-alpha.5",
+    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/types": "2.4.42-alpha.5",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 68f36b4bed..8c5c854bbd 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.4",
-    "@budibase/shared-core": "2.4.42-alpha.4",
+    "@budibase/bbui": "2.4.42-alpha.5",
+    "@budibase/shared-core": "2.4.42-alpha.5",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index acbbe90da4..57d0973471 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index cff1a6c68f..6f485eaba2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -44,12 +44,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.42-alpha.4",
-    "@budibase/client": "2.4.42-alpha.4",
+    "@budibase/backend-core": "2.4.42-alpha.5",
+    "@budibase/client": "2.4.42-alpha.5",
     "@budibase/pro": "2.4.42-alpha.4",
-    "@budibase/shared-core": "2.4.42-alpha.4",
-    "@budibase/string-templates": "2.4.42-alpha.4",
-    "@budibase/types": "2.4.42-alpha.4",
+    "@budibase/shared-core": "2.4.42-alpha.5",
+    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/types": "2.4.42-alpha.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 796b6a39b1..8a827b1969 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "2.4.42-alpha.4"
+    "@budibase/types": "2.4.42-alpha.5"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 1517bd0e70..d8609616b7 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 58fb202a86..c48a4fe708 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c370365a56..7befc0efc0 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.42-alpha.4",
+  "version": "2.4.42-alpha.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.4.42-alpha.4",
+    "@budibase/backend-core": "2.4.42-alpha.5",
     "@budibase/pro": "2.4.42-alpha.4",
-    "@budibase/string-templates": "2.4.42-alpha.4",
-    "@budibase/types": "2.4.42-alpha.4",
+    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/types": "2.4.42-alpha.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From a999a434069d76bd974f39b2046c85d33da51f6a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 10:46:08 +0000
Subject: [PATCH 17/19] Update pro version to 2.4.42-alpha.5

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 6f485eaba2..8d92bd490d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -46,7 +46,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.4.42-alpha.5",
     "@budibase/client": "2.4.42-alpha.5",
-    "@budibase/pro": "2.4.42-alpha.4",
+    "@budibase/pro": "2.4.42-alpha.5",
     "@budibase/shared-core": "2.4.42-alpha.5",
     "@budibase/string-templates": "2.4.42-alpha.5",
     "@budibase/types": "2.4.42-alpha.5",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0c2c983c83..6e48c2c5ec 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1290,14 +1290,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.42-alpha.4":
-  version "2.4.42-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.4.tgz#e4e86811dab639e211c3c4ad540841279f634115"
-  integrity sha512-var93QWJbwPHQtR4zIy/7g8ABOT2fQb43FMC2A+CLAQnJxBCu0Rcvk/5jkwOe18Te2+AiylC1OIGfvVbD3TTYA==
+"@budibase/backend-core@2.4.42-alpha.5":
+  version "2.4.42-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b"
+  integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.4"
+    "@budibase/types" "2.4.42-alpha.5"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1429,14 +1429,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.42-alpha.4":
-  version "2.4.42-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.4.tgz#8e81d08b4363c59e6aa872f532287327c2ef5e1e"
-  integrity sha512-6/CMcDnLRSzimR1JVy2FindRzN0YEo/B4lwYPtS2T5ORyCSBL24flwD15lhp2W4g0e1TF/+fPK/EaEXhJZglBg==
+"@budibase/pro@2.4.42-alpha.5":
+  version "2.4.42-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db"
+  integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.4"
+    "@budibase/backend-core" "2.4.42-alpha.5"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.4"
+    "@budibase/types" "2.4.42-alpha.5"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1475,10 +1475,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.42-alpha.4":
-  version "2.4.42-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.4.tgz#4a1ae0a9cd03e4ee0f81f64a494fbfd13ddbfdf6"
-  integrity sha512-eBB+VVtkld140Jno/quRlwlu9Q1GkeLyUQeXSrOed8dlmmImS4UKpOpAru+YxTklIvexJsM9H+AQw39IZR7L3g==
+"@budibase/types@2.4.42-alpha.5":
+  version "2.4.42-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080"
+  integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7befc0efc0..5dd8074b9f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.4.42-alpha.5",
-    "@budibase/pro": "2.4.42-alpha.4",
+    "@budibase/pro": "2.4.42-alpha.5",
     "@budibase/string-templates": "2.4.42-alpha.5",
     "@budibase/types": "2.4.42-alpha.5",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 82a492003a..e090e273aa 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.42-alpha.4":
-  version "2.4.42-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.4.tgz#e4e86811dab639e211c3c4ad540841279f634115"
-  integrity sha512-var93QWJbwPHQtR4zIy/7g8ABOT2fQb43FMC2A+CLAQnJxBCu0Rcvk/5jkwOe18Te2+AiylC1OIGfvVbD3TTYA==
+"@budibase/backend-core@2.4.42-alpha.5":
+  version "2.4.42-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b"
+  integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.4"
+    "@budibase/types" "2.4.42-alpha.5"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.42-alpha.4":
-  version "2.4.42-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.4.tgz#8e81d08b4363c59e6aa872f532287327c2ef5e1e"
-  integrity sha512-6/CMcDnLRSzimR1JVy2FindRzN0YEo/B4lwYPtS2T5ORyCSBL24flwD15lhp2W4g0e1TF/+fPK/EaEXhJZglBg==
+"@budibase/pro@2.4.42-alpha.5":
+  version "2.4.42-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db"
+  integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.4"
+    "@budibase/backend-core" "2.4.42-alpha.5"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.4"
+    "@budibase/types" "2.4.42-alpha.5"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.42-alpha.4":
-  version "2.4.42-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.4.tgz#4a1ae0a9cd03e4ee0f81f64a494fbfd13ddbfdf6"
-  integrity sha512-eBB+VVtkld140Jno/quRlwlu9Q1GkeLyUQeXSrOed8dlmmImS4UKpOpAru+YxTklIvexJsM9H+AQw39IZR7L3g==
+"@budibase/types@2.4.42-alpha.5":
+  version "2.4.42-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080"
+  integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 9c8fcacf2adcd3c607a4661f742be1c97ad86e37 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 11:08:33 +0000
Subject: [PATCH 18/19] v2.4.42-alpha.6

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  6 +++---
 packages/builder/package.json          | 12 ++++++------
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           | 12 ++++++------
 packages/frontend-core/package.json    |  6 +++---
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 12 ++++++------
 packages/shared-core/package.json      |  4 ++--
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 13 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7926e03ecb..ec0b168f51 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e7c6217cee..ee2b6f84d3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/types": "2.4.42-alpha.6",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b4c0241a49..94da724d5c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1e175eb757..adc480f842 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.5",
-    "@budibase/client": "2.4.42-alpha.5",
-    "@budibase/frontend-core": "2.4.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/bbui": "2.4.42-alpha.6",
+    "@budibase/client": "2.4.42-alpha.6",
+    "@budibase/frontend-core": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8dc178342f..fb14ceb887 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/backend-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index b491cad175..7becd3c1a4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.5",
-    "@budibase/frontend-core": "2.4.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/bbui": "2.4.42-alpha.6",
+    "@budibase/frontend-core": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 8c5c854bbd..eed2c50934 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
+    "@budibase/bbui": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.6",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 57d0973471..2f40008b29 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 8d92bd490d..6cf8392902 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -44,12 +44,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.42-alpha.5",
-    "@budibase/client": "2.4.42-alpha.5",
+    "@budibase/backend-core": "2.4.42-alpha.6",
+    "@budibase/client": "2.4.42-alpha.6",
     "@budibase/pro": "2.4.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 8a827b1969..c06b9645fb 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "2.4.42-alpha.5"
+    "@budibase/types": "2.4.42-alpha.6"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d8609616b7..211045e065 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index c48a4fe708..e8d505fc2f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5dd8074b9f..72d68bb3e5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.4.42-alpha.5",
+    "@budibase/backend-core": "2.4.42-alpha.6",
     "@budibase/pro": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 175cbaf4b0695a7b903a42f79eeb05c6ea9ef7c5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 11:11:39 +0000
Subject: [PATCH 19/19] Update pro version to 2.4.42-alpha.6

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 6cf8392902..e415c93309 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -46,7 +46,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.4.42-alpha.6",
     "@budibase/client": "2.4.42-alpha.6",
-    "@budibase/pro": "2.4.42-alpha.5",
+    "@budibase/pro": "2.4.42-alpha.6",
     "@budibase/shared-core": "2.4.42-alpha.6",
     "@budibase/string-templates": "2.4.42-alpha.6",
     "@budibase/types": "2.4.42-alpha.6",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 6e48c2c5ec..7a61c22469 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1290,14 +1290,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b"
-  integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg==
+"@budibase/backend-core@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.6.tgz#58aec63492de6612d561609be3653203ab5de0c8"
+  integrity sha512-gwdG4cLrzadAC4q6bQLvixzOpVxvmnvr0WAM+glVgM2IaCNpCVA/Da/g0UyRzMXUV6cAUYA+UhLlpIO1HoOz9w==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1429,14 +1429,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db"
-  integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg==
+"@budibase/pro@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.6.tgz#86fdcf55a674c4642bc585e8697e122b85b83453"
+  integrity sha512-2xrtBsHEbw0XeRTOQl/t8I9Uw97wMGWGiWqSIa+jAGu2NUyznKQRXzBcgMRjRWDNvy1ALkuFvHQAxmHX4hk5qw==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.5"
+    "@budibase/backend-core" "2.4.42-alpha.6"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1475,10 +1475,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080"
-  integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg==
+"@budibase/types@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.6.tgz#6d7d3f5b89bf05977e3e948e1ac73e876ac926a4"
+  integrity sha512-bYhUVgvQew+SNQK6DKWOS0jGwt5yR7V9qf3s+2H4+wFwilpbpHA00X67EvveDcR8NvXzyOnuL5TnDO5yuHzNEQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 72d68bb3e5..d54152ac38 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.4.42-alpha.6",
-    "@budibase/pro": "2.4.42-alpha.5",
+    "@budibase/pro": "2.4.42-alpha.6",
     "@budibase/string-templates": "2.4.42-alpha.6",
     "@budibase/types": "2.4.42-alpha.6",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e090e273aa..d828e3e2e6 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b"
-  integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg==
+"@budibase/backend-core@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.6.tgz#58aec63492de6612d561609be3653203ab5de0c8"
+  integrity sha512-gwdG4cLrzadAC4q6bQLvixzOpVxvmnvr0WAM+glVgM2IaCNpCVA/Da/g0UyRzMXUV6cAUYA+UhLlpIO1HoOz9w==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db"
-  integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg==
+"@budibase/pro@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.6.tgz#86fdcf55a674c4642bc585e8697e122b85b83453"
+  integrity sha512-2xrtBsHEbw0XeRTOQl/t8I9Uw97wMGWGiWqSIa+jAGu2NUyznKQRXzBcgMRjRWDNvy1ALkuFvHQAxmHX4hk5qw==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.5"
+    "@budibase/backend-core" "2.4.42-alpha.6"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080"
-  integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg==
+"@budibase/types@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.6.tgz#6d7d3f5b89bf05977e3e948e1ac73e876ac926a4"
+  integrity sha512-bYhUVgvQew+SNQK6DKWOS0jGwt5yR7V9qf3s+2H4+wFwilpbpHA00X67EvveDcR8NvXzyOnuL5TnDO5yuHzNEQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"