From 52db113a51339258c1b04699e9617c08b3107bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9F?= <panos@unbunt.org>
Date: Mon, 20 Sep 2021 09:37:14 +0200
Subject: [PATCH 01/27] fix ingress-nginx repo url

---
 hosting/kubernetes/budibase/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/kubernetes/budibase/Chart.yaml b/hosting/kubernetes/budibase/Chart.yaml
index b82cb3bab2..d00b228b0e 100644
--- a/hosting/kubernetes/budibase/Chart.yaml
+++ b/hosting/kubernetes/budibase/Chart.yaml
@@ -37,5 +37,5 @@ dependencies:
     condition: services.couchdb.enabled
   - name: ingress-nginx
     version: 3.35.0 
-    repository: https://github.com/kubernetes/ingress-nginx
+    repository: https://kubernetes.github.io/ingress-nginx
     condition: services.ingress.nginx

From 99644b0cd8ed811b84c4b23686cccb85147b8bf2 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Thu, 23 Sep 2021 11:11:00 +0200
Subject: [PATCH 02/27] Retrieve all columns from all not internal tables

---
 packages/server/src/integrations/postgres.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts
index dd46652871..3f9011db94 100644
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@@ -105,7 +105,7 @@ module PostgresModule {
     private readonly config: PostgresConfig
 
     COLUMNS_SQL =
-      "select * from information_schema.columns where table_schema = 'public'"
+      "select * from information_schema.columns where not table_schema = 'information_schema' and not table_schema = 'pg_catalog'"
 
     PRIMARY_KEYS_SQL = `
     select tc.table_schema, tc.table_name, kc.column_name as primary_key 

From 42d9e0a482ce57775ccf00f3dd3023055e927e4e Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 27 Sep 2021 16:37:26 +0100
Subject: [PATCH 03/27] Remove platform url in the cloud, remove analytics
 picker completely

---
 packages/builder/src/analytics/index.js       | 18 +-------
 .../portal/settings/organisation.svelte       | 44 ++++++-------------
 packages/server/package.json                  |  4 +-
 3 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/packages/builder/src/analytics/index.js b/packages/builder/src/analytics/index.js
index b79ab67e0c..e9edf38d74 100644
--- a/packages/builder/src/analytics/index.js
+++ b/packages/builder/src/analytics/index.js
@@ -3,8 +3,6 @@ import PosthogClient from "./PosthogClient"
 import IntercomClient from "./IntercomClient"
 import SentryClient from "./SentryClient"
 import { Events } from "./constants"
-import { auth } from "stores/portal"
-import { get } from "svelte/store"
 
 const posthog = new PosthogClient(
   process.env.POSTHOG_TOKEN,
@@ -19,27 +17,13 @@ class AnalyticsHub {
   }
 
   async activate() {
-    // Setting the analytics env var off in the backend overrides org/tenant settings
     const analyticsStatus = await api.get("/api/analytics")
     const json = await analyticsStatus.json()
 
-    // Multitenancy disabled on the backend
+    // Analytics disabled
     if (!json.enabled) return
 
-    const tenantId = get(auth).tenantId
-
-    if (tenantId) {
-      const res = await api.get(
-        `/api/global/configs/public?tenantId=${tenantId}`
-      )
-      const orgJson = await res.json()
-
-      // analytics opted out for the tenant
-      if (orgJson.config?.analytics === false) return
-    }
-
     this.clients.forEach(client => client.init())
-    this.enabled = true
   }
 
   identify(id, metadata) {
diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
index 79eaebb28b..a182103c4e 100644
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@@ -7,13 +7,11 @@
     Divider,
     Label,
     Input,
-    Toggle,
     Dropzone,
     notifications,
   } from "@budibase/bbui"
-  import { auth, organisation } from "stores/portal"
+  import { auth, organisation, admin } from "stores/portal"
   import { post } from "builderStore/api"
-  import analytics from "analytics"
   import { writable } from "svelte/store"
   import { redirect } from "@roxi/routify"
 
@@ -25,7 +23,6 @@
   }
 
   const values = writable({
-    analytics: analytics.enabled,
     company: $organisation.company,
     platformUrl: $organisation.platformUrl,
     logo: $organisation.logoUrl
@@ -57,7 +54,6 @@
     const config = {
       company: $values.company ?? "",
       platformUrl: $values.platformUrl ?? "",
-      analytics: $values.analytics,
     }
     // remove logo if required
     if (!$values.logo) {
@@ -112,34 +108,22 @@
         </div>
       </div>
     </div>
-    <Divider size="S" />
-    <Layout gap="XS" noPadding>
-      <Heading size="S">Platform</Heading>
-      <Body size="S">Here you can set up general platform settings.</Body>
-    </Layout>
-    <div class="fields">
-      <div class="field">
-        <Label size="L">Platform URL</Label>
-        <Input thin bind:value={$values.platformUrl} />
-      </div>
-    </div>
-    <Divider size="S" />
-    <Layout gap="S" noPadding>
+    {#if !$admin.cloud}
+      <Divider size="S" />
       <Layout gap="XS" noPadding>
-        <Heading size="S">Analytics</Heading>
-        <Body size="S">
-          If you would like to send analytics that help us make Budibase better,
-          please let us know below.
-        </Body>
+        <Heading size="S">Platform</Heading>
+        <Body size="S">Here you can set up general platform settings.</Body>
       </Layout>
-      <Toggle
-        text="Send Analytics to Budibase"
-        bind:value={$values.analytics}
-      />
-      <div>
-        <Button disabled={loading} on:click={saveConfig} cta>Save</Button>
+      <div class="fields">
+        <div class="field">
+          <Label size="L">Platform URL</Label>
+          <Input thin bind:value={$values.platformUrl} />
+        </div>
       </div>
-    </Layout>
+    {/if}
+    <div>
+      <Button disabled={loading} on:click={saveConfig} cta>Save</Button>
+    </div>
   </Layout>
 {/if}
 
diff --git a/packages/server/package.json b/packages/server/package.json
index 1e2dc602ae..a038e03960 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -25,7 +25,9 @@
     "lint:fix": "yarn run format && yarn run lint",
     "initialise": "node scripts/initialise.js",
     "multi:enable": "node scripts/multiTenancy.js enable",
-    "multi:disable": "node scripts/multiTenancy.js disable"
+    "multi:disable": "node scripts/multiTenancy.js disable",
+    "selfhost:enable": "node scripts/selfhost.js enable",
+    "selfhost:disable": "node scripts/selfhost.js disable"
   },
   "jest": {
     "preset": "ts-jest",

From 0806e69010d7df91d4684c61e113ec4c07d218b6 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Sep 2021 10:15:48 +0100
Subject: [PATCH 04/27] Temp account portal logging

---
 packages/auth/src/middleware/authenticated.js | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/auth/src/middleware/authenticated.js b/packages/auth/src/middleware/authenticated.js
index 944f3ee9d9..98773ded44 100644
--- a/packages/auth/src/middleware/authenticated.js
+++ b/packages/auth/src/middleware/authenticated.js
@@ -10,10 +10,15 @@ function finalise(
   { authenticated, user, internal, version, publicEndpoint } = {}
 ) {
   ctx.publicEndpoint = publicEndpoint || false
+  console.log("Temp Auth Middleware: public endoint", ctx.publicEndpoint)
   ctx.isAuthenticated = authenticated || false
+  console.log("Temp Auth Middleware: isAuthenticated", ctx.isAuthenticated)
   ctx.user = user
+  console.log("Temp Auth Middleware: user", ctx.user)
   ctx.internal = internal || false
+  console.log("Temp Auth Middleware: internal", ctx.internal)
   ctx.version = version
+  console.log("Temp Auth Middleware: version", ctx.version)
 }
 
 /**
@@ -27,40 +32,50 @@ module.exports = (
 ) => {
   const noAuthOptions = noAuthPatterns ? buildMatcherRegex(noAuthPatterns) : []
   return async (ctx, next) => {
+    console.log("Temp Auth Middleware: Start auth middleware")
     let publicEndpoint = false
     const version = ctx.request.headers[Headers.API_VER]
     // the path is not authenticated
     const found = matches(ctx, noAuthOptions)
     if (found) {
+      console.log("Temp Auth Middleware: Public endpoint found")
       publicEndpoint = true
     }
     try {
+      console.log("Temp Auth Middleware: Parsing cookie")
       // check the actual user is authenticated first
       const authCookie = getCookie(ctx, Cookies.Auth)
       let authenticated = false,
         user = null,
         internal = false
       if (authCookie) {
+        console.log("Temp Auth Middleware: Auth cookie found")
         let error = null
         const sessionId = authCookie.sessionId,
           userId = authCookie.userId
+        console.log("Temp Auth Middleware: Getting session")
         const session = await getSession(userId, sessionId)
         if (!session) {
           error = "No session found"
         } else {
           try {
+            console.log("Temp Auth Middleware: Getting user")
             if (opts && opts.populateUser) {
+              console.log("Temp Auth Middleware: Populate user function found")
               user = await getUser(
                 userId,
                 session.tenantId,
                 opts.populateUser(ctx)
               )
             } else {
+              console.log("Temp Auth Middleware: Getting user from DB")
               user = await getUser(userId, session.tenantId)
             }
             delete user.password
+            console.log("Temp Auth Middleware: User is authenticated")
             authenticated = true
           } catch (err) {
+            console.log("Temp Auth Middleware: Holy shit there was an error")
             error = err
           }
         }
@@ -69,6 +84,7 @@ module.exports = (
           // remove the cookie as the user does not exist anymore
           clearCookie(ctx, Cookies.Auth)
         } else {
+          console.log("Temp Auth Middleware: No error")
           // make sure we denote that the session is still in use
           await updateSessionTTL(session)
         }
@@ -87,14 +103,23 @@ module.exports = (
       if (authenticated !== true) {
         authenticated = false
       }
+      console.log("Temp Auth Middleware: Auth status", {
+        authenticated,
+        user,
+        internal,
+        version,
+        publicEndpoint,
+      })
       // isAuthenticated is a function, so use a variable to be able to check authed state
       finalise(ctx, { authenticated, user, internal, version, publicEndpoint })
       return next()
     } catch (err) {
+      console.log("Temp Auth Middleware: Error:", err)
       // allow configuring for public access
       if ((opts && opts.publicAllowed) || publicEndpoint) {
         finalise(ctx, { authenticated: false, version, publicEndpoint })
       } else {
+        console.log("Temp Auth Middleware: Throwing error status", err.status)
         ctx.throw(err.status || 403, err)
       }
     }

From 9e8b14f0fbf6d86229c15071eb294570a026b4c5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Sep 2021 09:24:39 +0000
Subject: [PATCH 05/27] v0.9.143-alpha.1

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 01c429c73d..df7816b085 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 0457520d91..98c2c978f8 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 42e4215caa..c25d4dd85e 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": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 2c255835ce..1846c445aa 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.0",
-    "@budibase/client": "^0.9.143-alpha.0",
+    "@budibase/bbui": "^0.9.143-alpha.1",
+    "@budibase/client": "^0.9.143-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.0",
+    "@budibase/string-templates": "^0.9.143-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 29763b9da6..f9d81ed830 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index f9777629f4..5bd6cdfb71 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.0",
+    "@budibase/bbui": "^0.9.143-alpha.1",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.0",
+    "@budibase/string-templates": "^0.9.143-alpha.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index ad289e8c0d..ba5bdce69b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +62,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.0",
-    "@budibase/client": "^0.9.143-alpha.0",
-    "@budibase/string-templates": "^0.9.143-alpha.0",
+    "@budibase/auth": "^0.9.143-alpha.1",
+    "@budibase/client": "^0.9.143-alpha.1",
+    "@budibase/string-templates": "^0.9.143-alpha.1",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 9b3c2487b9..469a3eebb5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a1cd5c90e1..2952e2bda3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.0",
+  "version": "0.9.143-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.0",
-    "@budibase/string-templates": "^0.9.143-alpha.0",
+    "@budibase/auth": "^0.9.143-alpha.1",
+    "@budibase/string-templates": "^0.9.143-alpha.1",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From df261bf3ea68044c173ad237efdb88d547f08e0e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 28 Sep 2021 11:33:07 +0100
Subject: [PATCH 06/27] Revert "Temp account portal logging"

---
 packages/auth/src/middleware/authenticated.js | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/packages/auth/src/middleware/authenticated.js b/packages/auth/src/middleware/authenticated.js
index 98773ded44..944f3ee9d9 100644
--- a/packages/auth/src/middleware/authenticated.js
+++ b/packages/auth/src/middleware/authenticated.js
@@ -10,15 +10,10 @@ function finalise(
   { authenticated, user, internal, version, publicEndpoint } = {}
 ) {
   ctx.publicEndpoint = publicEndpoint || false
-  console.log("Temp Auth Middleware: public endoint", ctx.publicEndpoint)
   ctx.isAuthenticated = authenticated || false
-  console.log("Temp Auth Middleware: isAuthenticated", ctx.isAuthenticated)
   ctx.user = user
-  console.log("Temp Auth Middleware: user", ctx.user)
   ctx.internal = internal || false
-  console.log("Temp Auth Middleware: internal", ctx.internal)
   ctx.version = version
-  console.log("Temp Auth Middleware: version", ctx.version)
 }
 
 /**
@@ -32,50 +27,40 @@ module.exports = (
 ) => {
   const noAuthOptions = noAuthPatterns ? buildMatcherRegex(noAuthPatterns) : []
   return async (ctx, next) => {
-    console.log("Temp Auth Middleware: Start auth middleware")
     let publicEndpoint = false
     const version = ctx.request.headers[Headers.API_VER]
     // the path is not authenticated
     const found = matches(ctx, noAuthOptions)
     if (found) {
-      console.log("Temp Auth Middleware: Public endpoint found")
       publicEndpoint = true
     }
     try {
-      console.log("Temp Auth Middleware: Parsing cookie")
       // check the actual user is authenticated first
       const authCookie = getCookie(ctx, Cookies.Auth)
       let authenticated = false,
         user = null,
         internal = false
       if (authCookie) {
-        console.log("Temp Auth Middleware: Auth cookie found")
         let error = null
         const sessionId = authCookie.sessionId,
           userId = authCookie.userId
-        console.log("Temp Auth Middleware: Getting session")
         const session = await getSession(userId, sessionId)
         if (!session) {
           error = "No session found"
         } else {
           try {
-            console.log("Temp Auth Middleware: Getting user")
             if (opts && opts.populateUser) {
-              console.log("Temp Auth Middleware: Populate user function found")
               user = await getUser(
                 userId,
                 session.tenantId,
                 opts.populateUser(ctx)
               )
             } else {
-              console.log("Temp Auth Middleware: Getting user from DB")
               user = await getUser(userId, session.tenantId)
             }
             delete user.password
-            console.log("Temp Auth Middleware: User is authenticated")
             authenticated = true
           } catch (err) {
-            console.log("Temp Auth Middleware: Holy shit there was an error")
             error = err
           }
         }
@@ -84,7 +69,6 @@ module.exports = (
           // remove the cookie as the user does not exist anymore
           clearCookie(ctx, Cookies.Auth)
         } else {
-          console.log("Temp Auth Middleware: No error")
           // make sure we denote that the session is still in use
           await updateSessionTTL(session)
         }
@@ -103,23 +87,14 @@ module.exports = (
       if (authenticated !== true) {
         authenticated = false
       }
-      console.log("Temp Auth Middleware: Auth status", {
-        authenticated,
-        user,
-        internal,
-        version,
-        publicEndpoint,
-      })
       // isAuthenticated is a function, so use a variable to be able to check authed state
       finalise(ctx, { authenticated, user, internal, version, publicEndpoint })
       return next()
     } catch (err) {
-      console.log("Temp Auth Middleware: Error:", err)
       // allow configuring for public access
       if ((opts && opts.publicAllowed) || publicEndpoint) {
         finalise(ctx, { authenticated: false, version, publicEndpoint })
       } else {
-        console.log("Temp Auth Middleware: Throwing error status", err.status)
         ctx.throw(err.status || 403, err)
       }
     }

From 5605209a7a4ede4471536cb24ed0d82e42f0e719 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Sep 2021 10:53:02 +0000
Subject: [PATCH 07/27] v0.9.143-alpha.2

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index df7816b085..8c5b3e450b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 98c2c978f8..7e880c1e4c 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c25d4dd85e..f3fcfd4644 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": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1846c445aa..7728c462be 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.1",
-    "@budibase/client": "^0.9.143-alpha.1",
+    "@budibase/bbui": "^0.9.143-alpha.2",
+    "@budibase/client": "^0.9.143-alpha.2",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.1",
+    "@budibase/string-templates": "^0.9.143-alpha.2",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f9d81ed830..dc3843905c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 5bd6cdfb71..d8b44711b5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.1",
+    "@budibase/bbui": "^0.9.143-alpha.2",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.1",
+    "@budibase/string-templates": "^0.9.143-alpha.2",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 63d74cff2d..061cd30915 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.1",
-    "@budibase/client": "^0.9.143-alpha.1",
-    "@budibase/string-templates": "^0.9.143-alpha.1",
+    "@budibase/auth": "^0.9.143-alpha.2",
+    "@budibase/client": "^0.9.143-alpha.2",
+    "@budibase/string-templates": "^0.9.143-alpha.2",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 469a3eebb5..293ea677fb 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2952e2bda3..2d47d3c8c1 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.1",
+  "version": "0.9.143-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.1",
-    "@budibase/string-templates": "^0.9.143-alpha.1",
+    "@budibase/auth": "^0.9.143-alpha.2",
+    "@budibase/string-templates": "^0.9.143-alpha.2",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From fc8aa07bf4b388984af44706e6c15d5ea5ec5262 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Sep 2021 12:21:31 +0000
Subject: [PATCH 08/27] v0.9.143-alpha.3

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 8c5b3e450b..f90cdc25b7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 7e880c1e4c..e24a365ba9 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index f3fcfd4644..fbf1c0e282 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": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7728c462be..14795f0dc1 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.2",
-    "@budibase/client": "^0.9.143-alpha.2",
+    "@budibase/bbui": "^0.9.143-alpha.3",
+    "@budibase/client": "^0.9.143-alpha.3",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.2",
+    "@budibase/string-templates": "^0.9.143-alpha.3",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index dc3843905c..84de82a3db 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index d8b44711b5..184fc8290c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.2",
+    "@budibase/bbui": "^0.9.143-alpha.3",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.2",
+    "@budibase/string-templates": "^0.9.143-alpha.3",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 061cd30915..0f653637ec 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.2",
-    "@budibase/client": "^0.9.143-alpha.2",
-    "@budibase/string-templates": "^0.9.143-alpha.2",
+    "@budibase/auth": "^0.9.143-alpha.3",
+    "@budibase/client": "^0.9.143-alpha.3",
+    "@budibase/string-templates": "^0.9.143-alpha.3",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 293ea677fb..857573d827 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2d47d3c8c1..2ce25d2a74 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.2",
+  "version": "0.9.143-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.2",
-    "@budibase/string-templates": "^0.9.143-alpha.2",
+    "@budibase/auth": "^0.9.143-alpha.3",
+    "@budibase/string-templates": "^0.9.143-alpha.3",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 2b2697a34e0e720059d3788ab3aaeda436794abc Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Tue, 28 Sep 2021 13:33:15 +0100
Subject: [PATCH 09/27] Fixing issue with refreshing data providers manually
 due to incorrect action name

---
 .../EventsEditor/actions/RefreshDataProvider.svelte             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/RefreshDataProvider.svelte
index fe251a0320..93ddca8c3f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/RefreshDataProvider.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/RefreshDataProvider.svelte
@@ -8,7 +8,7 @@
   $: actionProviders = getActionProviderComponents(
     $currentAsset,
     $store.selectedComponentId,
-    "RefreshDataProvider"
+    "RefreshDatasource"
   )
 </script>
 

From c03b9afbee0ae2b8295efb5a899c500ae8614c82 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Sep 2021 12:41:39 +0000
Subject: [PATCH 10/27] v0.9.143-alpha.4

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index f90cdc25b7..71be7bfa92 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index e24a365ba9..edf2a0ad17 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index fbf1c0e282..81a7a3b077 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": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 14795f0dc1..82bebadbf2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.3",
-    "@budibase/client": "^0.9.143-alpha.3",
+    "@budibase/bbui": "^0.9.143-alpha.4",
+    "@budibase/client": "^0.9.143-alpha.4",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.3",
+    "@budibase/string-templates": "^0.9.143-alpha.4",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 84de82a3db..57878e2929 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 184fc8290c..d4a4a24ba9 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.3",
+    "@budibase/bbui": "^0.9.143-alpha.4",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.3",
+    "@budibase/string-templates": "^0.9.143-alpha.4",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 0f653637ec..07f11c8161 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.3",
-    "@budibase/client": "^0.9.143-alpha.3",
-    "@budibase/string-templates": "^0.9.143-alpha.3",
+    "@budibase/auth": "^0.9.143-alpha.4",
+    "@budibase/client": "^0.9.143-alpha.4",
+    "@budibase/string-templates": "^0.9.143-alpha.4",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 857573d827..bae80e4ca6 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2ce25d2a74..29e8137932 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.3",
+  "version": "0.9.143-alpha.4",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.3",
-    "@budibase/string-templates": "^0.9.143-alpha.3",
+    "@budibase/auth": "^0.9.143-alpha.4",
+    "@budibase/string-templates": "^0.9.143-alpha.4",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From b964813fad402aa06b54c8e07c070e58d86ab2cf Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Sep 2021 15:22:19 +0100
Subject: [PATCH 11/27] Prevent root account users being re-created as internal
 budibase users

---
 packages/auth/accounts.js                           |  1 +
 packages/worker/src/api/controllers/global/users.js | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 packages/auth/accounts.js

diff --git a/packages/auth/accounts.js b/packages/auth/accounts.js
new file mode 100644
index 0000000000..47ad03456a
--- /dev/null
+++ b/packages/auth/accounts.js
@@ -0,0 +1 @@
+module.exports = require("./src/cloud/accounts")
diff --git a/packages/worker/src/api/controllers/global/users.js b/packages/worker/src/api/controllers/global/users.js
index 1d3f38698b..9d2d27a05c 100644
--- a/packages/worker/src/api/controllers/global/users.js
+++ b/packages/worker/src/api/controllers/global/users.js
@@ -11,6 +11,7 @@ const { sendEmail } = require("../../../utilities/email")
 const { user: userCache } = require("@budibase/auth/cache")
 const { invalidateSessions } = require("@budibase/auth/sessions")
 const CouchDB = require("../../../db")
+const accounts = require("@budibase/auth/accounts")
 const {
   getGlobalDB,
   getTenantId,
@@ -49,10 +50,19 @@ async function saveUser(
   // make sure another user isn't using the same email
   let dbUser
   if (email) {
+    // check budibase users inside the tenant
     dbUser = await getGlobalUserByEmail(email)
     if (dbUser != null && (dbUser._id !== _id || Array.isArray(dbUser))) {
       throw "Email address already in use."
     }
+
+    // check root account users in account portal
+    if (!env.SELF_HOSTED) {
+      const account = await accounts.getAccount(email)
+      if (account) {
+        throw "Email address already in use."
+      }
+    }
   } else {
     dbUser = await db.get(_id)
   }

From 4b30a4e7ef0a6251c3f5ce8d18b6e190f84da62b Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Sep 2021 15:49:03 +0100
Subject: [PATCH 12/27] Prevent duplicate internal budibase users across
 tenants

---
 .../src/api/controllers/global/users.js       | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/worker/src/api/controllers/global/users.js b/packages/worker/src/api/controllers/global/users.js
index 9d2d27a05c..7753370f09 100644
--- a/packages/worker/src/api/controllers/global/users.js
+++ b/packages/worker/src/api/controllers/global/users.js
@@ -56,6 +56,14 @@ async function saveUser(
       throw "Email address already in use."
     }
 
+    // check budibase users in other tenants
+    if (env.MULTI_TENANCY) {
+      dbUser = await getTenantUser(email)
+      if (dbUser != null) {
+        throw "Email address already in use."
+      }
+    }
+
     // check root account users in account portal
     if (!env.SELF_HOSTED) {
       const account = await accounts.getAccount(email)
@@ -277,13 +285,22 @@ exports.find = async ctx => {
   ctx.body = user
 }
 
-exports.tenantUserLookup = async ctx => {
-  const id = ctx.params.id
-  // lookup, could be email or userId, either will return a doc
+// lookup, could be email or userId, either will return a doc
+const getTenantUser = async identifier => {
   const db = new CouchDB(PLATFORM_INFO_DB)
   try {
-    ctx.body = await db.get(id)
+    return await db.get(identifier)
   } catch (err) {
+    return null
+  }
+}
+
+exports.tenantUserLookup = async ctx => {
+  const id = ctx.params.id
+  const user = await getTenantUser(id)
+  if (user) {
+    ctx.body = user
+  } else {
     ctx.throw(400, "No tenant user found.")
   }
 }

From 0518bac62eaa4d71ddd75b36625562295be29b1f Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Sep 2021 16:35:31 +0100
Subject: [PATCH 13/27] Set cookie domain to fix logout

---
 .../kubernetes/budibase/{ => templates}/.helmignore  |  0
 .../budibase/templates/app-service-deployment.yaml   |  2 ++
 .../templates/worker-service-deployment.yaml         |  2 ++
 hosting/kubernetes/budibase/values.yaml              |  1 +
 packages/auth/src/environment.js                     |  1 +
 packages/auth/src/utils.js                           | 12 ++++++++++--
 6 files changed, 16 insertions(+), 2 deletions(-)
 rename hosting/kubernetes/budibase/{ => templates}/.helmignore (100%)

diff --git a/hosting/kubernetes/budibase/.helmignore b/hosting/kubernetes/budibase/templates/.helmignore
similarity index 100%
rename from hosting/kubernetes/budibase/.helmignore
rename to hosting/kubernetes/budibase/templates/.helmignore
diff --git a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
index b101ab7854..5d9aee2619 100644
--- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
@@ -94,6 +94,8 @@ spec:
           value: {{ .Values.globals.sentryDSN }}
         - name: WORKER_URL
           value: worker-service:{{ .Values.services.worker.port }}
+        - name: COOKIE_DOMAIN
+          value: {{ .Values.globals.cookieDomain | quote }}
         image: budibase/apps
         imagePullPolicy: Always
         name: bbapps
diff --git a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
index 6c165872c8..98a921a8a6 100644
--- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
@@ -89,6 +89,8 @@ spec:
           value: {{ .Values.globals.selfHosted | quote }}
         - name: ACCOUNT_PORTAL_URL
           value: {{ .Values.globals.accountPortalUrl | quote }}
+        - name: COOKIE_DOMAIN
+          value: {{ .Values.globals.cookieDomain | quote }}
         image: budibase/worker
         imagePullPolicy: Always
         name: bbworker
diff --git a/hosting/kubernetes/budibase/values.yaml b/hosting/kubernetes/budibase/values.yaml
index 1113842c8b..c9b2549b30 100644
--- a/hosting/kubernetes/budibase/values.yaml
+++ b/hosting/kubernetes/budibase/values.yaml
@@ -90,6 +90,7 @@ globals:
   logLevel: info
   selfHosted: 1
   accountPortalUrL: ""
+  cookieDomain: ""
   createSecrets: true # creates an internal API key, JWT secrets and redis password for you
 
   # if createSecrets is set to false, you can hard-code your secrets here
diff --git a/packages/auth/src/environment.js b/packages/auth/src/environment.js
index bae5c65a1b..da24afc8a0 100644
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@@ -22,6 +22,7 @@ module.exports = {
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
   SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
+  COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
   isTest,
   _set(key, value) {
     process.env[key] = value
diff --git a/packages/auth/src/utils.js b/packages/auth/src/utils.js
index 5936948fd7..f03ae300f7 100644
--- a/packages/auth/src/utils.js
+++ b/packages/auth/src/utils.js
@@ -4,6 +4,7 @@ const { options } = require("./middleware/passport/jwt")
 const { createUserEmailView } = require("./db/views")
 const { Headers } = require("./constants")
 const { getGlobalDB } = require("./tenancy")
+const environment = require("./environment")
 
 const APP_PREFIX = DocumentTypes.APP + SEPARATOR
 
@@ -70,12 +71,19 @@ exports.setCookie = (ctx, value, name = "builder") => {
     ctx.cookies.set(name)
   } else {
     value = jwt.sign(value, options.secretOrKey)
-    ctx.cookies.set(name, value, {
+
+    const config = {
       maxAge: Number.MAX_SAFE_INTEGER,
       path: "/",
       httpOnly: false,
       overwrite: true,
-    })
+    }
+
+    if (environment.COOKIE_DOMAIN) {
+      config.domain = environment.COOKIE_DOMAIN
+    }
+
+    ctx.cookies.set(name, value, config)
   }
 }
 

From 46d22a1ae66bbacb3ea4e733c56d0335588a7b6c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 28 Sep 2021 16:40:03 +0100
Subject: [PATCH 14/27] adding subdomain checking to tenancy middleware

---
 packages/auth/src/tenancy/context.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/auth/src/tenancy/context.js b/packages/auth/src/tenancy/context.js
index b1ef5a5807..01d1fdc604 100644
--- a/packages/auth/src/tenancy/context.js
+++ b/packages/auth/src/tenancy/context.js
@@ -53,6 +53,11 @@ exports.setTenantId = (
   // processed later in the chain
   tenantId = user.tenantId || header || tenantId
 
+  // Set the tenantId from the subdomain
+  if (!tenantId) {
+    tenantId = ctx.subdomains && ctx.subdomains[0]
+  }
+
   if (!tenantId && !allowNoTenant) {
     ctx.throw(403, "Tenant id not set")
   }

From fd7e768ea19da35031b8657f5db83edbfbe86d78 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Sep 2021 16:04:16 +0000
Subject: [PATCH 15/27] v0.9.143-alpha.5

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 71be7bfa92..9a4365ace9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index edf2a0ad17..e4c4a30bbd 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 81a7a3b077..4e01575014 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": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 82bebadbf2..1d9f2e42a5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.4",
-    "@budibase/client": "^0.9.143-alpha.4",
+    "@budibase/bbui": "^0.9.143-alpha.5",
+    "@budibase/client": "^0.9.143-alpha.5",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.4",
+    "@budibase/string-templates": "^0.9.143-alpha.5",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 57878e2929..9df99b296e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index d4a4a24ba9..d1fb4b268a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.4",
+    "@budibase/bbui": "^0.9.143-alpha.5",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.4",
+    "@budibase/string-templates": "^0.9.143-alpha.5",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 07f11c8161..4251c582fb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.4",
-    "@budibase/client": "^0.9.143-alpha.4",
-    "@budibase/string-templates": "^0.9.143-alpha.4",
+    "@budibase/auth": "^0.9.143-alpha.5",
+    "@budibase/client": "^0.9.143-alpha.5",
+    "@budibase/string-templates": "^0.9.143-alpha.5",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index bae80e4ca6..7e262f7846 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 29e8137932..01911c3388 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.4",
+  "version": "0.9.143-alpha.5",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.4",
-    "@budibase/string-templates": "^0.9.143-alpha.4",
+    "@budibase/auth": "^0.9.143-alpha.5",
+    "@budibase/string-templates": "^0.9.143-alpha.5",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 402365f5b37c79aa603d2b99479cbddb58a389e6 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 28 Sep 2021 17:18:56 +0100
Subject: [PATCH 16/27] remove company size logic from the code

---
 packages/builder/src/stores/portal/auth.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index e33a1f22ac..95157e3f93 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -54,15 +54,13 @@ export function createAuthStore() {
     if (user) {
       analytics.activate().then(() => {
         analytics.identify(user._id, user)
-        if (user.size === "100+" || user.size === "10000+") {
-          analytics.showChat({
-            email: user.email,
-            created_at: user.createdAt || Date.now(),
-            name: user.name,
-            user_id: user._id,
-            tenant: user.tenantId,
-          })
-        }
+        analytics.showChat({
+          email: user.email,
+          created_at: user.createdAt || Date.now(),
+          name: user.name,
+          user_id: user._id,
+          tenant: user.tenantId,
+        })
       })
     }
   }

From 4f8da83dae42d672d609de66db12a6f717215575 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Sep 2021 16:35:28 +0000
Subject: [PATCH 17/27] v0.9.143-alpha.6

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9a4365ace9..58b710b3d6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index e4c4a30bbd..2174b6adce 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4e01575014..36d6f0fcad 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": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1d9f2e42a5..6fb6291550 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.5",
-    "@budibase/client": "^0.9.143-alpha.5",
+    "@budibase/bbui": "^0.9.143-alpha.6",
+    "@budibase/client": "^0.9.143-alpha.6",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.5",
+    "@budibase/string-templates": "^0.9.143-alpha.6",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9df99b296e..c6900c19a7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index d1fb4b268a..0e859f5ada 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.5",
+    "@budibase/bbui": "^0.9.143-alpha.6",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.5",
+    "@budibase/string-templates": "^0.9.143-alpha.6",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 4251c582fb..d45bf124fc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.5",
-    "@budibase/client": "^0.9.143-alpha.5",
-    "@budibase/string-templates": "^0.9.143-alpha.5",
+    "@budibase/auth": "^0.9.143-alpha.6",
+    "@budibase/client": "^0.9.143-alpha.6",
+    "@budibase/string-templates": "^0.9.143-alpha.6",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 7e262f7846..6e8262c0b3 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 01911c3388..a509f917c5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.5",
+  "version": "0.9.143-alpha.6",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.5",
-    "@budibase/string-templates": "^0.9.143-alpha.5",
+    "@budibase/auth": "^0.9.143-alpha.6",
+    "@budibase/string-templates": "^0.9.143-alpha.6",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 875e64e5a6122428c79ee52fe7aa8b0f6aacbb2e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Sep 2021 16:50:47 +0000
Subject: [PATCH 18/27] v0.9.143-alpha.7

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 58b710b3d6..1d2d09e7a9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 2174b6adce..11167adc5f 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 36d6f0fcad..b9c33431a7 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": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6fb6291550..8df4565a24 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.6",
-    "@budibase/client": "^0.9.143-alpha.6",
+    "@budibase/bbui": "^0.9.143-alpha.7",
+    "@budibase/client": "^0.9.143-alpha.7",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.6",
+    "@budibase/string-templates": "^0.9.143-alpha.7",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index c6900c19a7..804a4852f9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 0e859f5ada..32011d392f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.6",
+    "@budibase/bbui": "^0.9.143-alpha.7",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.6",
+    "@budibase/string-templates": "^0.9.143-alpha.7",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index d45bf124fc..a11a9ab675 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.6",
-    "@budibase/client": "^0.9.143-alpha.6",
-    "@budibase/string-templates": "^0.9.143-alpha.6",
+    "@budibase/auth": "^0.9.143-alpha.7",
+    "@budibase/client": "^0.9.143-alpha.7",
+    "@budibase/string-templates": "^0.9.143-alpha.7",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 6e8262c0b3..6d5c150ae5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a509f917c5..b512fcd39a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.6",
+  "version": "0.9.143-alpha.7",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.6",
-    "@budibase/string-templates": "^0.9.143-alpha.6",
+    "@budibase/auth": "^0.9.143-alpha.7",
+    "@budibase/string-templates": "^0.9.143-alpha.7",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From f6256bfbd5d2b1d690c6f724965de4d9aeb92e78 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 28 Sep 2021 17:54:54 +0100
Subject: [PATCH 19/27] prevent SSO configured tenants being redirected to
 account portal

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

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index ce4e6015da..2613b96986 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -12,7 +12,7 @@
     }
 
     // redirect to account portal for authentication in the cloud
-    if (!$auth.user && $admin.cloud && $admin.accountPortalUrl) {
+    if (!$auth.user && $admin.cloud && $admin.accountPortalUrl && !$admin?.checklist?.sso?.checked) {
       window.location.href = $admin.accountPortalUrl
     }
   })

From b9ad634b8564746a00f0b9ba796f61b6b4799d5b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 29 Sep 2021 08:57:09 +0100
Subject: [PATCH 20/27] Fix bug with filter editor preventing date pickers or
 booleans from being shown

---
 .../PropertyControls/FilterEditor/FilterDrawer.svelte           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index d6bfadb150..4733fd4ffe 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -133,7 +133,7 @@
               />
             {:else if ["string", "longform", "number"].includes(filter.type)}
               <Input disabled={filter.noValue} bind:value={filter.value} />
-            {:else if filter.type === "options" || "array"}
+            {:else if ["options", "array"].includes(filter.type)}
               <Combobox
                 disabled={filter.noValue}
                 options={getFieldOptions(filter.field)}

From 0fa8accc6a9e3de1d6dedb029b80b7461542091a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 29 Sep 2021 08:27:38 +0000
Subject: [PATCH 21/27] v0.9.143-alpha.8

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 1d2d09e7a9..e6cf15d80b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 11167adc5f..599857806c 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b9c33431a7..9db140849f 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": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 8df4565a24..c4e548ef07 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.7",
-    "@budibase/client": "^0.9.143-alpha.7",
+    "@budibase/bbui": "^0.9.143-alpha.8",
+    "@budibase/client": "^0.9.143-alpha.8",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.7",
+    "@budibase/string-templates": "^0.9.143-alpha.8",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 804a4852f9..7af1d0cc62 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 32011d392f..f7b3884c03 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.7",
+    "@budibase/bbui": "^0.9.143-alpha.8",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.7",
+    "@budibase/string-templates": "^0.9.143-alpha.8",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index a11a9ab675..47d524271b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.7",
-    "@budibase/client": "^0.9.143-alpha.7",
-    "@budibase/string-templates": "^0.9.143-alpha.7",
+    "@budibase/auth": "^0.9.143-alpha.8",
+    "@budibase/client": "^0.9.143-alpha.8",
+    "@budibase/string-templates": "^0.9.143-alpha.8",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 6d5c150ae5..e0ab21d537 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b512fcd39a..768411bfb7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.7",
+  "version": "0.9.143-alpha.8",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.7",
-    "@budibase/string-templates": "^0.9.143-alpha.7",
+    "@budibase/auth": "^0.9.143-alpha.8",
+    "@budibase/string-templates": "^0.9.143-alpha.8",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 0edd6ffabde34c186baf28d1c6cf5d4f1dd7d09f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 29 Sep 2021 09:55:38 +0100
Subject: [PATCH 22/27] lint

---
 packages/builder/src/pages/builder/auth/_layout.svelte | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index 2613b96986..7e8c41d2c5 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -12,7 +12,12 @@
     }
 
     // redirect to account portal for authentication in the cloud
-    if (!$auth.user && $admin.cloud && $admin.accountPortalUrl && !$admin?.checklist?.sso?.checked) {
+    if (
+      !$auth.user &&
+      $admin.cloud &&
+      $admin.accountPortalUrl &&
+      !$admin?.checklist?.sso?.checked
+    ) {
       window.location.href = $admin.accountPortalUrl
     }
   })

From 1236b70bf9b8df6ac2cccc0f8281e8ae94f48290 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 29 Sep 2021 09:06:03 +0000
Subject: [PATCH 23/27] v0.9.143-alpha.9

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index e6cf15d80b..3f5a320ff1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 599857806c..dfa4e91e62 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9db140849f..13826985c8 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": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c4e548ef07..b3bb6a6fe5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.8",
-    "@budibase/client": "^0.9.143-alpha.8",
+    "@budibase/bbui": "^0.9.143-alpha.9",
+    "@budibase/client": "^0.9.143-alpha.9",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.8",
+    "@budibase/string-templates": "^0.9.143-alpha.9",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7af1d0cc62..40af06d5dd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index f7b3884c03..e230d832a9 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.8",
+    "@budibase/bbui": "^0.9.143-alpha.9",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.8",
+    "@budibase/string-templates": "^0.9.143-alpha.9",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 47d524271b..df0f879a56 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.8",
-    "@budibase/client": "^0.9.143-alpha.8",
-    "@budibase/string-templates": "^0.9.143-alpha.8",
+    "@budibase/auth": "^0.9.143-alpha.9",
+    "@budibase/client": "^0.9.143-alpha.9",
+    "@budibase/string-templates": "^0.9.143-alpha.9",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index e0ab21d537..fadf50abaa 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 768411bfb7..908bf39f11 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.8",
+  "version": "0.9.143-alpha.9",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.8",
-    "@budibase/string-templates": "^0.9.143-alpha.8",
+    "@budibase/auth": "^0.9.143-alpha.9",
+    "@budibase/string-templates": "^0.9.143-alpha.9",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From cb5f5138814bfd4d9eabefce57915f10e8ea7cad Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 29 Sep 2021 10:32:14 +0100
Subject: [PATCH 24/27] Adding important to some email color properties.

---
 packages/worker/src/constants/templates/base.hbs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/worker/src/constants/templates/base.hbs b/packages/worker/src/constants/templates/base.hbs
index 960d6faff1..438197b5d2 100644
--- a/packages/worker/src/constants/templates/base.hbs
+++ b/packages/worker/src/constants/templates/base.hbs
@@ -19,7 +19,7 @@
     }
 
     a {
-      color: #3869D4;
+      color: #3869D4 !important;
     }
 
     a img {
@@ -115,8 +115,8 @@
       border-bottom: 10px solid #3869D4;
       border-left: 18px solid #3869D4;
       display: inline-block;
-      color: #FFF;
-      text-decoration: none;
+      color: #FFF !important;
+      text-decoration: none !important;
       border-radius: 3px;
       box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
       -webkit-text-size-adjust: none;

From 90cb5b6b5f04ed2a10963147484769c5c90c333a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 29 Sep 2021 09:54:01 +0000
Subject: [PATCH 25/27] v0.9.143-alpha.10

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 3f5a320ff1..2ceccc2548 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index dfa4e91e62..3acdbf460e 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 13826985c8..6f4a7fdb1b 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": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b3bb6a6fe5..c0f6c92072 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.9",
-    "@budibase/client": "^0.9.143-alpha.9",
+    "@budibase/bbui": "^0.9.143-alpha.10",
+    "@budibase/client": "^0.9.143-alpha.10",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.9",
+    "@budibase/string-templates": "^0.9.143-alpha.10",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 40af06d5dd..2dcf754dba 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index e230d832a9..27dc1970e4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.9",
+    "@budibase/bbui": "^0.9.143-alpha.10",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.9",
+    "@budibase/string-templates": "^0.9.143-alpha.10",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index df0f879a56..7bb8ddcbdd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.9",
-    "@budibase/client": "^0.9.143-alpha.9",
-    "@budibase/string-templates": "^0.9.143-alpha.9",
+    "@budibase/auth": "^0.9.143-alpha.10",
+    "@budibase/client": "^0.9.143-alpha.10",
+    "@budibase/string-templates": "^0.9.143-alpha.10",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fadf50abaa..13aa026c4d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 908bf39f11..6e3d6172a6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.9",
+  "version": "0.9.143-alpha.10",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.9",
-    "@budibase/string-templates": "^0.9.143-alpha.9",
+    "@budibase/auth": "^0.9.143-alpha.10",
+    "@budibase/string-templates": "^0.9.143-alpha.10",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From fae21aa2c444982e311416cb0888d17ffee92b3f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 29 Sep 2021 10:20:38 +0000
Subject: [PATCH 26/27] v0.9.143-alpha.11

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2ceccc2548..24f87a8133 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 3acdbf460e..ae03122851 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 6f4a7fdb1b..413a012627 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": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c0f6c92072..0bdd64b4fc 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.10",
-    "@budibase/client": "^0.9.143-alpha.10",
+    "@budibase/bbui": "^0.9.143-alpha.11",
+    "@budibase/client": "^0.9.143-alpha.11",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143-alpha.10",
+    "@budibase/string-templates": "^0.9.143-alpha.11",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2dcf754dba..8f09e55692 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 27dc1970e4..58b6d9cd3f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143-alpha.10",
+    "@budibase/bbui": "^0.9.143-alpha.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143-alpha.10",
+    "@budibase/string-templates": "^0.9.143-alpha.11",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 7bb8ddcbdd..df6c0f7210 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.10",
-    "@budibase/client": "^0.9.143-alpha.10",
-    "@budibase/string-templates": "^0.9.143-alpha.10",
+    "@budibase/auth": "^0.9.143-alpha.11",
+    "@budibase/client": "^0.9.143-alpha.11",
+    "@budibase/string-templates": "^0.9.143-alpha.11",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 13aa026c4d..59d1ff3869 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6e3d6172a6..11e019c0ca 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143-alpha.10",
+  "version": "0.9.143-alpha.11",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143-alpha.10",
-    "@budibase/string-templates": "^0.9.143-alpha.10",
+    "@budibase/auth": "^0.9.143-alpha.11",
+    "@budibase/string-templates": "^0.9.143-alpha.11",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 435ba8185265a3cf4ca2bb7197d277f305359ef9 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 29 Sep 2021 10:39:31 +0000
Subject: [PATCH 27/27] v0.9.144-alpha.0

---
 lerna.json                             | 2 +-
 packages/auth/package.json             | 2 +-
 packages/bbui/package.json             | 2 +-
 packages/builder/package.json          | 8 ++++----
 packages/cli/package.json              | 2 +-
 packages/client/package.json           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 6fc7ac83f4..ed1c098f67 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 54a14b184f..067a5e66f6 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c1b6c6e620..9d6488ccf7 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": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 67632c490e..3da87b5653 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143",
-    "@budibase/client": "^0.9.143",
+    "@budibase/bbui": "^0.9.144-alpha.0",
+    "@budibase/client": "^0.9.144-alpha.0",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.143",
+    "@budibase/string-templates": "^0.9.144-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1352dccaa9..17d038227d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index d27a735c27..487d2c63f5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.143",
+    "@budibase/bbui": "^0.9.144-alpha.0",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.143",
+    "@budibase/string-templates": "^0.9.144-alpha.0",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 95125f1ce9..e45c2620ee 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -64,9 +64,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143",
-    "@budibase/client": "^0.9.143",
-    "@budibase/string-templates": "^0.9.143",
+    "@budibase/auth": "^0.9.144-alpha.0",
+    "@budibase/client": "^0.9.144-alpha.0",
+    "@budibase/string-templates": "^0.9.144-alpha.0",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index e97aaf3fad..ed41d23143 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5e99c077fc..66261e8f2e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.143",
+  "version": "0.9.144-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -25,8 +25,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.143",
-    "@budibase/string-templates": "^0.9.143",
+    "@budibase/auth": "^0.9.144-alpha.0",
+    "@budibase/string-templates": "^0.9.144-alpha.0",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",