From d8d4686e01f3ee71fdf9e3de55cd3931d92f54b2 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Thu, 13 Jul 2023 12:36:50 +0100
Subject: [PATCH 01/35] Account Portal API Testing

---
 packages/backend-core/src/constants/misc.ts   |  2 +
 .../src/account-api/api/apis/AccountAPI.ts    | 55 +++++++++++++++++++
 .../account-api/config/TestConfiguration.ts   | 34 ++++++++++++
 qa-core/src/account-api/fixtures/accounts.ts  | 20 +++++++
 qa-core/src/account-api/fixtures/index.ts     |  1 +
 .../account-api/tests/accounts/create.spec.ts | 20 +++++++
 .../account-api/tests/accounts/delete.spec.ts | 25 +++++++++
 .../account-api/tests/accounts/search.spec.ts | 22 ++++++++
 .../tests/accounts/validate.spec.ts           | 27 +++++++++
 .../account-api/tests/accounts/verify.spec.ts | 24 ++++++++
 10 files changed, 230 insertions(+)
 create mode 100644 qa-core/src/account-api/config/TestConfiguration.ts
 create mode 100644 qa-core/src/account-api/fixtures/accounts.ts
 create mode 100644 qa-core/src/account-api/fixtures/index.ts
 create mode 100644 qa-core/src/account-api/tests/accounts/create.spec.ts
 create mode 100644 qa-core/src/account-api/tests/accounts/delete.spec.ts
 create mode 100644 qa-core/src/account-api/tests/accounts/search.spec.ts
 create mode 100644 qa-core/src/account-api/tests/accounts/validate.spec.ts
 create mode 100644 qa-core/src/account-api/tests/accounts/verify.spec.ts

diff --git a/packages/backend-core/src/constants/misc.ts b/packages/backend-core/src/constants/misc.ts
index ba2533cf4a..0c68798164 100644
--- a/packages/backend-core/src/constants/misc.ts
+++ b/packages/backend-core/src/constants/misc.ts
@@ -20,6 +20,8 @@ export enum Header {
   TYPE = "x-budibase-type",
   PREVIEW_ROLE = "x-budibase-role",
   TENANT_ID = "x-budibase-tenant-id",
+  VERIFICATION_CODE = "x-budibase-verification-code",
+  RETURN_VERIFICATION_CODE = "x-budibase-return-verification-code",
   TOKEN = "x-budibase-token",
   CSRF_TOKEN = "x-csrf-token",
   CORRELATION_ID = "x-budibase-correlation-id",
diff --git a/qa-core/src/account-api/api/apis/AccountAPI.ts b/qa-core/src/account-api/api/apis/AccountAPI.ts
index fc6f6caecb..0e457c07e8 100644
--- a/qa-core/src/account-api/api/apis/AccountAPI.ts
+++ b/qa-core/src/account-api/api/apis/AccountAPI.ts
@@ -72,4 +72,59 @@ export default class AccountAPI {
     }
     return response
   }
+
+  async verifyAccount(
+      verificationCode: string,
+      opts: APIRequestOpts = { doExpect: true }
+  ): Promise<Response> {
+    const [response, json] = await this.client.post(
+        `/api/accounts/verify`,
+        {
+          body: { verificationCode },
+        }
+    )
+    if (opts.doExpect) {
+      expect(response).toHaveStatusCode(200)
+    }
+    return response
+  }
+
+  async verifyAccountSendEmail(
+      email: string,
+      opts: APIRequestOpts = { doExpect: true }
+  ): Promise<Response> {
+    const [response, json] = await this.client.post(
+        `/api/accounts/verify/send`,
+        {
+          body: { email },
+        }
+    )
+    if (opts.doExpect) {
+      expect(response).toHaveStatusCode(200)
+    }
+    return response
+  }
+
+  async search(
+      searchType: string,
+      search: 'email' | 'tenantId',
+      opts: APIRequestOpts = { doExpect: true }
+  ): Promise<Response> {
+    let body: { email?: string; tenantId?: string } = {}
+
+    if (search === 'email') {
+      body.email = searchType;
+    } else if (search === 'tenantId') {
+      body.tenantId = searchType;
+    }
+
+    const [response, json] = await this.client.post(
+        `/api/accounts/search`,
+        {body: body}
+    )
+    if (opts.doExpect) {
+      expect(response).toHaveStatusCode(200)
+    }
+    return response
+  }
 }
diff --git a/qa-core/src/account-api/config/TestConfiguration.ts b/qa-core/src/account-api/config/TestConfiguration.ts
new file mode 100644
index 0000000000..827cee42b7
--- /dev/null
+++ b/qa-core/src/account-api/config/TestConfiguration.ts
@@ -0,0 +1,34 @@
+import { AccountInternalAPI } from "../api"
+import { BudibaseTestConfiguration } from "../../shared"
+
+export default class TestConfiguration<T> extends BudibaseTestConfiguration {
+    // apis
+    api: AccountInternalAPI
+
+    context: T
+
+    constructor() {
+        super()
+        this.api = new AccountInternalAPI(this.state)
+        this.context = <T>{}
+    }
+
+    async beforeAll() {
+        await super.beforeAll()
+        await this.setApiKey()
+    }
+
+    async afterAll() {
+        await super.afterAll()
+    }
+
+    async setApiKey() {
+        const apiKeyResponse = await this.internalApi.self.getApiKey()
+        this.state.apiKey = apiKeyResponse.apiKey
+    }
+
+    async setCookieAuth() {
+        const apiKeyResponse = await this.internalApi.self.getApiKey()
+        this.state.apiKey = apiKeyResponse.apiKey
+    }
+}
diff --git a/qa-core/src/account-api/fixtures/accounts.ts b/qa-core/src/account-api/fixtures/accounts.ts
new file mode 100644
index 0000000000..c6c6fa163f
--- /dev/null
+++ b/qa-core/src/account-api/fixtures/accounts.ts
@@ -0,0 +1,20 @@
+import { generator } from "../../shared"
+import { Hosting, CreateAccountRequest } from "@budibase/types"
+
+export const generateAccount = (): CreateAccountRequest => {
+    const uuid = generator.guid()
+
+    const email = `${uuid}@budibase.com`
+    const tenant = `tenant${uuid.replace(/-/g, "")}`
+
+    return {
+        email,
+        hosting: Hosting.CLOUD,
+        name: email,
+        password: uuid,
+        profession: "software_engineer",
+        size: "10+",
+        tenantId: tenant,
+        tenantName: tenant,
+    }
+}
diff --git a/qa-core/src/account-api/fixtures/index.ts b/qa-core/src/account-api/fixtures/index.ts
new file mode 100644
index 0000000000..7d09ee1c2c
--- /dev/null
+++ b/qa-core/src/account-api/fixtures/index.ts
@@ -0,0 +1 @@
+export * as accounts from "./accounts"
\ No newline at end of file
diff --git a/qa-core/src/account-api/tests/accounts/create.spec.ts b/qa-core/src/account-api/tests/accounts/create.spec.ts
new file mode 100644
index 0000000000..e46a56e591
--- /dev/null
+++ b/qa-core/src/account-api/tests/accounts/create.spec.ts
@@ -0,0 +1,20 @@
+import TestConfiguration from "../../config/TestConfiguration"
+import * as fixtures from "../../fixtures"
+
+describe("Account API - Create Account", () => {
+    const config = new TestConfiguration()
+
+    beforeAll(async () => {
+        await config.beforeAll()
+    })
+
+    afterAll(async () => {
+        await config.afterAll()
+    })
+
+    it("Creates a new account", async () => {
+        await config.api.accounts.create({
+            ...fixtures.accounts.generateAccount()
+        })
+    })
+})
\ No newline at end of file
diff --git a/qa-core/src/account-api/tests/accounts/delete.spec.ts b/qa-core/src/account-api/tests/accounts/delete.spec.ts
new file mode 100644
index 0000000000..22fd39d17f
--- /dev/null
+++ b/qa-core/src/account-api/tests/accounts/delete.spec.ts
@@ -0,0 +1,25 @@
+import TestConfiguration from "../../config/TestConfiguration"
+import * as fixtures from "../../fixtures"
+
+describe("Account API - Delete Account", () => {
+    const config = new TestConfiguration()
+
+    beforeAll(async () => {
+        await config.beforeAll()
+    })
+
+    afterAll(async () => {
+        await config.afterAll()
+    })
+
+    // it("Deletes an account", async () => {
+    //
+    // })
+
+    it("Deletes an account by ID", async () => {
+        const [response, account] = await config.api.accounts.create({
+            ...fixtures.accounts.generateAccount()
+        })
+        await config.api.accounts.delete(account.accountId)
+    })
+})
\ No newline at end of file
diff --git a/qa-core/src/account-api/tests/accounts/search.spec.ts b/qa-core/src/account-api/tests/accounts/search.spec.ts
new file mode 100644
index 0000000000..6f4437d119
--- /dev/null
+++ b/qa-core/src/account-api/tests/accounts/search.spec.ts
@@ -0,0 +1,22 @@
+import TestConfiguration from "../../config/TestConfiguration"
+import { generator } from "../../../shared"
+
+describe("Account API - Search for Account", () => {
+    const config = new TestConfiguration()
+
+    beforeAll(async () => {
+        await config.beforeAll()
+    })
+
+    afterAll(async () => {
+        await config.afterAll()
+    })
+
+    it("Search account by email", async () => {
+        await config.api.accounts.search(generator.email(), "email")
+    })
+
+    it("Search account by tenantId", async () => {
+        await config.api.accounts.search(generator.word(), "tenantId")
+    })
+})
\ No newline at end of file
diff --git a/qa-core/src/account-api/tests/accounts/validate.spec.ts b/qa-core/src/account-api/tests/accounts/validate.spec.ts
new file mode 100644
index 0000000000..56894bb03f
--- /dev/null
+++ b/qa-core/src/account-api/tests/accounts/validate.spec.ts
@@ -0,0 +1,27 @@
+import TestConfiguration from "../../config/TestConfiguration"
+import { generator } from "../../../shared"
+import * as fixtures from "../../fixtures";
+
+describe("Account API - Validate Account", () => {
+    const config = new TestConfiguration()
+
+    beforeAll(async () => {
+        await config.beforeAll()
+    })
+
+    afterAll(async () => {
+        await config.afterAll()
+    })
+
+    const tenant = generator.word({length: 6})
+    const email = `${tenant}@budibase.com`
+
+
+    it("Validates an email", async () => {
+        await config.api.accounts.validateEmail(email)
+    })
+
+    it("Validates a tenant ID", async () => {
+        await config.api.accounts.validateTenantId(tenant)
+    })
+})
\ No newline at end of file
diff --git a/qa-core/src/account-api/tests/accounts/verify.spec.ts b/qa-core/src/account-api/tests/accounts/verify.spec.ts
new file mode 100644
index 0000000000..d3f2ff1a18
--- /dev/null
+++ b/qa-core/src/account-api/tests/accounts/verify.spec.ts
@@ -0,0 +1,24 @@
+import TestConfiguration from "../../config/TestConfiguration"
+import { generator } from "../../../shared"
+import * as fixtures from "../../fixtures";
+
+describe("Account API - Verify Account", () => {
+    const config = new TestConfiguration()
+
+    beforeAll(async () => {
+        await config.beforeAll()
+    })
+
+    afterAll(async () => {
+        await config.afterAll()
+    })
+
+
+    it("Verify an account", async () => {
+        await config.api.accounts.verifyAccount()
+    })
+
+    it("Send account verification email ", async () => {
+        await config.api.accounts.verifyAccountSendEmail()
+    })
+})
\ No newline at end of file

From 6f7ef18084389c8e525109b01e58cfeb742239a4 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 13 Jul 2023 12:48:44 +0100
Subject: [PATCH 02/35] Add account password login integration with global
 setup

---
 .../src/account-api/api/AccountInternalAPI.ts |  4 ++-
 qa-core/src/account-api/api/apis/AuthAPI.ts   | 32 +++++++++++++++++++
 qa-core/src/account-api/api/apis/index.ts     |  1 +
 qa-core/src/jest/globalSetup.ts               |  3 +-
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 qa-core/src/account-api/api/apis/AuthAPI.ts

diff --git a/qa-core/src/account-api/api/AccountInternalAPI.ts b/qa-core/src/account-api/api/AccountInternalAPI.ts
index a5abdcbccd..3813ad2c9e 100644
--- a/qa-core/src/account-api/api/AccountInternalAPI.ts
+++ b/qa-core/src/account-api/api/AccountInternalAPI.ts
@@ -1,15 +1,17 @@
 import AccountInternalAPIClient from "./AccountInternalAPIClient"
-import { AccountAPI, LicenseAPI } from "./apis"
+import { AccountAPI, LicenseAPI, AuthAPI } from "./apis"
 import { State } from "../../types"
 
 export default class AccountInternalAPI {
   client: AccountInternalAPIClient
 
+  auth: AuthAPI
   accounts: AccountAPI
   licenses: LicenseAPI
 
   constructor(state: State) {
     this.client = new AccountInternalAPIClient(state)
+    this.auth = new AuthAPI(this.client)
     this.accounts = new AccountAPI(this.client)
     this.licenses = new LicenseAPI(this.client)
   }
diff --git a/qa-core/src/account-api/api/apis/AuthAPI.ts b/qa-core/src/account-api/api/apis/AuthAPI.ts
new file mode 100644
index 0000000000..4d2dee6a0d
--- /dev/null
+++ b/qa-core/src/account-api/api/apis/AuthAPI.ts
@@ -0,0 +1,32 @@
+import { Response } from "node-fetch"
+import AccountInternalAPIClient from "../AccountInternalAPIClient"
+import { APIRequestOpts } from "../../../types"
+
+export default class AuthAPI {
+  client: AccountInternalAPIClient
+
+  constructor(client: AccountInternalAPIClient) {
+    this.client = client
+  }
+
+  async login(
+    email: string,
+    password: string,
+    opts: APIRequestOpts = { doExpect: true }
+  ): Promise<[Response, string]> {
+    const [response, json] = await this.client.post(
+      `/api/auth/login`,
+      {
+        body: {
+          username: email,
+          password: password,
+        },
+      }
+    )
+    if (opts.doExpect) {
+      expect(response).toHaveStatusCode(200)
+    }
+    const cookie = response.headers.get("set-cookie")
+    return [response, cookie!]
+  }
+}
diff --git a/qa-core/src/account-api/api/apis/index.ts b/qa-core/src/account-api/api/apis/index.ts
index b8a1dc7b4a..1137ac3e36 100644
--- a/qa-core/src/account-api/api/apis/index.ts
+++ b/qa-core/src/account-api/api/apis/index.ts
@@ -1,2 +1,3 @@
+export { default as AuthAPI } from "./AuthAPI"
 export { default as AccountAPI } from "./AccountAPI"
 export { default as LicenseAPI } from "./LicenseAPI"
diff --git a/qa-core/src/jest/globalSetup.ts b/qa-core/src/jest/globalSetup.ts
index 040a65ecef..f73ea1011e 100644
--- a/qa-core/src/jest/globalSetup.ts
+++ b/qa-core/src/jest/globalSetup.ts
@@ -68,8 +68,7 @@ async function loginAsAdmin() {
 }
 
 async function loginAsAccount(account: CreateAccountRequest) {
-  const [res, cookie] = await internalApi.auth.login(
-    account.tenantId,
+  const [res, cookie] = await accountsApi.auth.login(
     account.email,
     account.password,
     API_OPTS

From fa94b8b9fc43f8a58e130daa9ca7946821b585ab Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Fri, 14 Jul 2023 14:24:01 +0100
Subject: [PATCH 03/35] Changes for Account API Testing

---
 .../worker/src/api/controllers/global/auth.ts |  2 ++
 .../src/account-api/api/apis/AccountAPI.ts    |  7 ++++++
 qa-core/src/account-api/api/apis/AuthAPI.ts   |  2 +-
 .../account-api/config/TestConfiguration.ts   |  6 ++---
 .../account-api/tests/accounts/create.spec.ts |  2 +-
 .../account-api/tests/accounts/delete.spec.ts | 23 ++++++++++++++++---
 .../tests/accounts/validate.spec.ts           |  2 ++
 .../account-api/tests/accounts/verify.spec.ts | 14 +++++++++++
 .../src/shared/BudibaseTestConfiguration.ts   |  3 ++-
 9 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 131601c6ad..a458a98aa7 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -53,6 +53,8 @@ async function passportCallback(
 }
 
 export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
+  const tenantId = context.getTenantId()
+  console.log(tenantId)
   const email = ctx.request.body.username
 
   const user = await userSdk.getUserByEmail(email)
diff --git a/qa-core/src/account-api/api/apis/AccountAPI.ts b/qa-core/src/account-api/api/apis/AccountAPI.ts
index 0e457c07e8..7897a3c210 100644
--- a/qa-core/src/account-api/api/apis/AccountAPI.ts
+++ b/qa-core/src/account-api/api/apis/AccountAPI.ts
@@ -73,6 +73,13 @@ export default class AccountAPI {
     return response
   }
 
+  async deleteCurrentAccount() {
+    const [response, json] = await this.client.del(
+        `/api/accounts`
+    )
+    return response
+  }
+
   async verifyAccount(
       verificationCode: string,
       opts: APIRequestOpts = { doExpect: true }
diff --git a/qa-core/src/account-api/api/apis/AuthAPI.ts b/qa-core/src/account-api/api/apis/AuthAPI.ts
index 4d2dee6a0d..9c375d2b5d 100644
--- a/qa-core/src/account-api/api/apis/AuthAPI.ts
+++ b/qa-core/src/account-api/api/apis/AuthAPI.ts
@@ -18,7 +18,7 @@ export default class AuthAPI {
       `/api/auth/login`,
       {
         body: {
-          username: email,
+          email: email,
           password: password,
         },
       }
diff --git a/qa-core/src/account-api/config/TestConfiguration.ts b/qa-core/src/account-api/config/TestConfiguration.ts
index 827cee42b7..ee5f3fbd45 100644
--- a/qa-core/src/account-api/config/TestConfiguration.ts
+++ b/qa-core/src/account-api/config/TestConfiguration.ts
@@ -27,8 +27,6 @@ export default class TestConfiguration<T> extends BudibaseTestConfiguration {
         this.state.apiKey = apiKeyResponse.apiKey
     }
 
-    async setCookieAuth() {
-        const apiKeyResponse = await this.internalApi.self.getApiKey()
-        this.state.apiKey = apiKeyResponse.apiKey
-    }
+
+
 }
diff --git a/qa-core/src/account-api/tests/accounts/create.spec.ts b/qa-core/src/account-api/tests/accounts/create.spec.ts
index e46a56e591..2c26c5170b 100644
--- a/qa-core/src/account-api/tests/accounts/create.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/create.spec.ts
@@ -14,7 +14,7 @@ describe("Account API - Create Account", () => {
 
     it("Creates a new account", async () => {
         await config.api.accounts.create({
-            ...fixtures.accounts.generateAccount()
+             ...fixtures.accounts.generateAccount()
         })
     })
 })
\ No newline at end of file
diff --git a/qa-core/src/account-api/tests/accounts/delete.spec.ts b/qa-core/src/account-api/tests/accounts/delete.spec.ts
index 22fd39d17f..20df48dafb 100644
--- a/qa-core/src/account-api/tests/accounts/delete.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/delete.spec.ts
@@ -12,9 +12,26 @@ describe("Account API - Delete Account", () => {
         await config.afterAll()
     })
 
-    // it("Deletes an account", async () => {
-    //
-    // })
+    it("Deletes an account", async () => {
+        // Create account
+        const createAccountRequest = fixtures.accounts.generateAccount()
+
+        await config.api.accounts.create(
+            createAccountRequest
+        )
+
+        // Login - Get cookie
+        await config.login(
+            createAccountRequest.email,
+            createAccountRequest.password,
+            createAccountRequest.tenantId
+        )
+
+        // Delete account
+        const [ res ] = await config.api.accounts.deleteCurrentAccount()
+
+        expect(res.status).toBe(204)
+    })
 
     it("Deletes an account by ID", async () => {
         const [response, account] = await config.api.accounts.create({
diff --git a/qa-core/src/account-api/tests/accounts/validate.spec.ts b/qa-core/src/account-api/tests/accounts/validate.spec.ts
index 56894bb03f..5794949eee 100644
--- a/qa-core/src/account-api/tests/accounts/validate.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/validate.spec.ts
@@ -18,10 +18,12 @@ describe("Account API - Validate Account", () => {
 
 
     it("Validates an email", async () => {
+
         await config.api.accounts.validateEmail(email)
     })
 
     it("Validates a tenant ID", async () => {
+
         await config.api.accounts.validateTenantId(tenant)
     })
 })
\ No newline at end of file
diff --git a/qa-core/src/account-api/tests/accounts/verify.spec.ts b/qa-core/src/account-api/tests/accounts/verify.spec.ts
index d3f2ff1a18..222c4cb4ea 100644
--- a/qa-core/src/account-api/tests/accounts/verify.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/verify.spec.ts
@@ -15,10 +15,24 @@ describe("Account API - Verify Account", () => {
 
 
     it("Verify an account", async () => {
+        // Create account
+        await config.api.accounts.create({
+            ...fixtures.accounts.generateAccount()
+        })
+        // Invite user
+
+        // Verify account via code
         await config.api.accounts.verifyAccount()
     })
 
     it("Send account verification email ", async () => {
+        // Create account
+        await config.api.accounts.create({
+            ...fixtures.accounts.generateAccount()
+        })
+        // Invite user
+
+        // Verify account via email
         await config.api.accounts.verifyAccountSendEmail()
     })
 })
\ No newline at end of file
diff --git a/qa-core/src/shared/BudibaseTestConfiguration.ts b/qa-core/src/shared/BudibaseTestConfiguration.ts
index 12a0f16138..d8fd2bee61 100644
--- a/qa-core/src/shared/BudibaseTestConfiguration.ts
+++ b/qa-core/src/shared/BudibaseTestConfiguration.ts
@@ -43,7 +43,8 @@ export default class BudibaseTestConfiguration {
   async login(email: string, password: string, tenantId?: string) {
     if (!tenantId && this.state.tenantId) {
       tenantId = this.state.tenantId
-    } else {
+    }
+    if (!tenantId) {
       throw new Error("Could not determine tenant id")
     }
     const [res, cookie] = await this.internalApi.auth.login(

From f45a439b2686fcd70b85d9597bf0d432811bbafb Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 14 Jul 2023 15:03:51 +0100
Subject: [PATCH 04/35] Add state helpers for isolating account deletion test

---
 .../account-api/tests/accounts/delete.spec.ts | 30 +++++++++----------
 .../src/shared/BudibaseTestConfiguration.ts   | 24 +++++++++++++++
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/qa-core/src/account-api/tests/accounts/delete.spec.ts b/qa-core/src/account-api/tests/accounts/delete.spec.ts
index 20df48dafb..2d476d78c0 100644
--- a/qa-core/src/account-api/tests/accounts/delete.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/delete.spec.ts
@@ -13,24 +13,22 @@ describe("Account API - Delete Account", () => {
     })
 
     it("Deletes an account", async () => {
-        // Create account
-        const createAccountRequest = fixtures.accounts.generateAccount()
+        await config.doInNewState(async () => {
+            // Create account
+            const createAccountRequest = fixtures.accounts.generateAccount()
+            await config.api.accounts.create(createAccountRequest)
 
-        await config.api.accounts.create(
-            createAccountRequest
-        )
+            // Login - Get cookie
+            await config.login(
+              createAccountRequest.email,
+              createAccountRequest.password,
+              createAccountRequest.tenantId
+            )
 
-        // Login - Get cookie
-        await config.login(
-            createAccountRequest.email,
-            createAccountRequest.password,
-            createAccountRequest.tenantId
-        )
-
-        // Delete account
-        const [ res ] = await config.api.accounts.deleteCurrentAccount()
-
-        expect(res.status).toBe(204)
+            // Delete account
+            const res = await config.api.accounts.deleteCurrentAccount()
+            expect(res.status).toBe(204)
+        })
     })
 
     it("Deletes an account by ID", async () => {
diff --git a/qa-core/src/shared/BudibaseTestConfiguration.ts b/qa-core/src/shared/BudibaseTestConfiguration.ts
index d8fd2bee61..c1aaeb0cae 100644
--- a/qa-core/src/shared/BudibaseTestConfiguration.ts
+++ b/qa-core/src/shared/BudibaseTestConfiguration.ts
@@ -40,6 +40,30 @@ export default class BudibaseTestConfiguration {
 
   // AUTH
 
+  async doInNewState(task: any) {
+    return this.doWithState(task, {})
+  }
+
+  async doWithState(task: any, state: State) {
+    const original = this.state
+
+    // override the state
+    this.state.apiKey = state.apiKey
+    this.state.appId = state.appId
+    this.state.cookie = state.cookie
+    this.state.tableId = state.tableId
+    this.state.tenantId = state.tenantId
+
+    await task()
+
+    // restore the state
+    this.state.apiKey = original.apiKey
+    this.state.appId = original.appId
+    this.state.cookie = original.cookie
+    this.state.tableId = original.tableId
+    this.state.tenantId = original.tenantId
+  }
+
   async login(email: string, password: string, tenantId?: string) {
     if (!tenantId && this.state.tenantId) {
       tenantId = this.state.tenantId

From c464e5c91d471596bfae031b8f1330b22b1bfefd Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 14 Jul 2023 15:22:44 +0100
Subject: [PATCH 05/35] Type /api/accounts/search request + response bodies

---
 packages/types/src/api/account/accounts.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/types/src/api/account/accounts.ts b/packages/types/src/api/account/accounts.ts
index 9191babc86..e2accf7c18 100644
--- a/packages/types/src/api/account/accounts.ts
+++ b/packages/types/src/api/account/accounts.ts
@@ -1,3 +1,4 @@
+import { Account } from "../../documents"
 import { Hosting } from "../../sdk"
 
 export interface CreateAccountRequest {
@@ -11,3 +12,11 @@ export interface CreateAccountRequest {
   name?: string
   password: string
 }
+
+export interface SearchAccountsRequest {
+  // one or the other - not both
+  email?: string
+  tenantId?: string
+}
+
+export type SearchAccountsResponse = Account[]
\ No newline at end of file

From 278f6f8df3ec48cbcc6331a0338dea0aa60fde8f Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 14 Jul 2023 15:23:22 +0100
Subject: [PATCH 06/35] Update account search tests / add email to state

---
 .../src/account-api/api/apis/AccountAPI.ts    |  8 ++---
 .../account-api/config/TestConfiguration.ts   |  3 --
 .../account-api/tests/accounts/search.spec.ts | 31 ++++++++++++++++---
 qa-core/src/jest/globalSetup.ts               |  2 ++
 .../src/shared/BudibaseTestConfiguration.ts   |  4 +++
 qa-core/src/types/state.ts                    |  1 +
 6 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/qa-core/src/account-api/api/apis/AccountAPI.ts b/qa-core/src/account-api/api/apis/AccountAPI.ts
index 7897a3c210..37aa3313ba 100644
--- a/qa-core/src/account-api/api/apis/AccountAPI.ts
+++ b/qa-core/src/account-api/api/apis/AccountAPI.ts
@@ -1,5 +1,5 @@
 import { Response } from "node-fetch"
-import { Account, CreateAccountRequest } from "@budibase/types"
+import { Account, CreateAccountRequest, SearchAccountsRequest, SearchAccountsResponse } from "@budibase/types"
 import AccountInternalAPIClient from "../AccountInternalAPIClient"
 import { APIRequestOpts } from "../../../types"
 
@@ -116,8 +116,8 @@ export default class AccountAPI {
       searchType: string,
       search: 'email' | 'tenantId',
       opts: APIRequestOpts = { doExpect: true }
-  ): Promise<Response> {
-    let body: { email?: string; tenantId?: string } = {}
+  ): Promise<[Response, SearchAccountsResponse]> {
+    let body: SearchAccountsRequest = {}
 
     if (search === 'email') {
       body.email = searchType;
@@ -132,6 +132,6 @@ export default class AccountAPI {
     if (opts.doExpect) {
       expect(response).toHaveStatusCode(200)
     }
-    return response
+    return [response, json]
   }
 }
diff --git a/qa-core/src/account-api/config/TestConfiguration.ts b/qa-core/src/account-api/config/TestConfiguration.ts
index ee5f3fbd45..6322be97f0 100644
--- a/qa-core/src/account-api/config/TestConfiguration.ts
+++ b/qa-core/src/account-api/config/TestConfiguration.ts
@@ -26,7 +26,4 @@ export default class TestConfiguration<T> extends BudibaseTestConfiguration {
         const apiKeyResponse = await this.internalApi.self.getApiKey()
         this.state.apiKey = apiKeyResponse.apiKey
     }
-
-
-
 }
diff --git a/qa-core/src/account-api/tests/accounts/search.spec.ts b/qa-core/src/account-api/tests/accounts/search.spec.ts
index 6f4437d119..a39cf8e325 100644
--- a/qa-core/src/account-api/tests/accounts/search.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/search.spec.ts
@@ -12,11 +12,32 @@ describe("Account API - Search for Account", () => {
         await config.afterAll()
     })
 
-    it("Search account by email", async () => {
-        await config.api.accounts.search(generator.email(), "email")
-    })
 
-    it("Search account by tenantId", async () => {
-        await config.api.accounts.search(generator.word(), "tenantId")
+    describe("POST /api/accounts/search", () => {
+        describe("by tenant", () => {
+            it("returns 200 + empty", async () => {
+                const tenantId = generator.string()
+                const [res, body] = await config.api.accounts.search(tenantId, "tenantId")
+                expect(res.status).toBe(200)
+                expect(body.length).toBe(0)
+            })
+
+            it("returns 200 + found", async () => {
+                const [res, body] = await config.api.accounts.search(config.state.tenantId!, "tenantId")
+                expect(res.status).toBe(200)
+                expect(body.length).toBe(1)
+                expect(body[0].tenantId).toBe(config.state.tenantId)
+            })
+        })
+
+        describe("by email", () => {
+            it("returns 200 + empty", async () => {
+                await config.api.accounts.search(generator.word(), "email")
+            })
+
+            it("returns 200 + found", async () => {
+                await config.api.accounts.search(generator.word(), "email")
+            })
+        })
     })
 })
\ No newline at end of file
diff --git a/qa-core/src/jest/globalSetup.ts b/qa-core/src/jest/globalSetup.ts
index f73ea1011e..e52f8cfe16 100644
--- a/qa-core/src/jest/globalSetup.ts
+++ b/qa-core/src/jest/globalSetup.ts
@@ -89,6 +89,8 @@ async function setup() {
     // @ts-ignore
     global.qa.tenantId = account.tenantId
     // @ts-ignore
+    global.qa.email = account.email
+    // @ts-ignore
     global.qa.accountId = newAccount.accountId
     await loginAsAccount(account)
   } else {
diff --git a/qa-core/src/shared/BudibaseTestConfiguration.ts b/qa-core/src/shared/BudibaseTestConfiguration.ts
index c1aaeb0cae..c6955fd87f 100644
--- a/qa-core/src/shared/BudibaseTestConfiguration.ts
+++ b/qa-core/src/shared/BudibaseTestConfiguration.ts
@@ -23,6 +23,8 @@ export default class BudibaseTestConfiguration {
     // @ts-ignore
     this.state.tenantId = global.qa.tenantId
     // @ts-ignore
+    this.state.email = global.qa.email
+    // @ts-ignore
     this.state.cookie = global.qa.authCookie
   }
 
@@ -53,6 +55,7 @@ export default class BudibaseTestConfiguration {
     this.state.cookie = state.cookie
     this.state.tableId = state.tableId
     this.state.tenantId = state.tenantId
+    this.state.email = state.email
 
     await task()
 
@@ -62,6 +65,7 @@ export default class BudibaseTestConfiguration {
     this.state.cookie = original.cookie
     this.state.tableId = original.tableId
     this.state.tenantId = original.tenantId
+    this.state.email = original.email
   }
 
   async login(email: string, password: string, tenantId?: string) {
diff --git a/qa-core/src/types/state.ts b/qa-core/src/types/state.ts
index 0da471e090..8fab3998ce 100644
--- a/qa-core/src/types/state.ts
+++ b/qa-core/src/types/state.ts
@@ -4,4 +4,5 @@ export interface State {
   cookie?: string
   tableId?: string
   tenantId?: string
+  email?: string
 }

From 263df94076eb7197be28fc235a0fa16b2d22d405 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 17 Jul 2023 14:07:53 +0100
Subject: [PATCH 07/35] Altered structure of the tours to allow tour level
 config with an onSkip fn option. Tour steps now moved to 'steps' entry

---
 .../portal/onboarding/TourPopover.svelte      |  38 +++-
 .../portal/onboarding/TourWrap.svelte         |   2 +-
 .../src/components/portal/onboarding/tours.js | 194 +++++++++---------
 .../builder/app/[application]/_layout.svelte  |   2 +-
 4 files changed, 125 insertions(+), 111 deletions(-)

diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index d4958b386e..4607150c29 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Popover, Layout, Heading, Body, Button } from "@budibase/bbui"
+  import { Popover, Layout, Heading, Body, Button, Link } from "@budibase/bbui"
   import { store } from "builderStore"
   import { TOURS } from "./tours.js"
   import { goto, layout, isActive } from "@roxi/routify"
@@ -10,17 +10,19 @@
   let tourStep
   let tourStepIdx
   let lastStep
+  let skipping = false
 
   $: tourNodes = { ...$store.tourNodes }
   $: tourKey = $store.tourKey
   $: tourStepKey = $store.tourStepKey
+  $: tourOnSkip = TOURS[tourKey]?.onSkip
 
   const updateTourStep = (targetStepKey, tourKey) => {
     if (!tourKey) {
       return
     }
     if (!tourSteps?.length) {
-      tourSteps = [...TOURS[tourKey]]
+      tourSteps = [...TOURS[tourKey].steps]
     }
     tourStepIdx = getCurrentStepIdx(tourSteps, targetStepKey)
     lastStep = tourStepIdx + 1 == tourSteps.length
@@ -132,16 +134,28 @@
           </Body>
           <div class="tour-footer">
             <div class="tour-navigation">
-              {#if tourStepIdx > 0}
-                <Button
+              {#if typeof tourOnSkip === "function"}
+                <!-- <Button
                   secondary
-                  on:click={previousStep}
-                  disabled={tourStepIdx == 0}
+                  quiet
+                  on:click={() => {
+                    skipping = true
+                    tourOnSkip()
+                  }}
+                  disabled={skipping}
+                >
+                  Skip
+                </Button> -->
+                <Link
+                  quiet
+                  on:click={() => {
+                    skipping = true
+                    tourOnSkip()
+                  }}
+                  disabled={skipping}>Skip</Link
                 >
-                  <div>Back</div>
-                </Button>
               {/if}
-              <Button cta on:click={nextStep}>
+              <Button cta on:click={nextStep} disabled={skipping}>
                 <div>{lastStep ? "Finish" : "Next"}</div>
               </Button>
             </div>
@@ -157,9 +171,13 @@
     padding: var(--spacing-xl);
   }
   .tour-navigation {
-    grid-gap: var(--spectrum-alias-grid-baseline);
+    grid-gap: var(--spacing-xl);
     display: flex;
     justify-content: end;
+    align-items: center;
+  }
+  .tour-navigation :global(.spectrum-Link) {
+    color: white;
   }
   .tour-body :global(.feature-list) {
     margin-bottom: 0px;
diff --git a/packages/builder/src/components/portal/onboarding/TourWrap.svelte b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
index fd47d7b48e..dd667057ca 100644
--- a/packages/builder/src/components/portal/onboarding/TourWrap.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
@@ -13,7 +13,7 @@
 
   const registerTourNode = (tourKey, stepKey) => {
     if (ready && !registered && tourKey) {
-      currentTourStep = TOURS[tourKey].find(step => step.id === stepKey)
+      currentTourStep = TOURS[tourKey].steps.find(step => step.id === stepKey)
       if (!currentTourStep) {
         return
       }
diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index 1101034e0f..0fcefce6f4 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -20,6 +20,34 @@ export const TOUR_KEYS = {
   FEATURE_ONBOARDING: "feature-onboarding",
 }
 
+// TOUR_BUILDER_ONBOARDING - termination
+const endUserOnboarding = async () => {
+  // Mark the users onboarding as complete
+  // Clear all tour related state
+  if (get(auth).user) {
+    try {
+      await API.updateSelf({
+        onboardedAt: new Date().toISOString(),
+      })
+
+      // Update the cached user
+      await auth.getSelf()
+
+      store.update(state => ({
+        ...state,
+        tourNodes: undefined,
+        tourKey: undefined,
+        tourKeyStep: undefined,
+        onboarding: false,
+      }))
+    } catch (e) {
+      console.log("Onboarding failed", e)
+      return false
+    }
+    return true
+  }
+}
+
 const tourEvent = eventKey => {
   analytics.captureEvent(`${ONBOARDING_EVENT_PREFIX}:${eventKey}`, {
     eventSource: EventSource.PORTAL,
@@ -28,111 +56,79 @@ const tourEvent = eventKey => {
 
 const getTours = () => {
   return {
-    [TOUR_KEYS.TOUR_BUILDER_ONBOARDING]: [
-      {
-        id: TOUR_STEP_KEYS.BUILDER_DATA_SECTION,
-        title: "Data",
-        route: "/builder/app/:application/data",
-        layout: OnboardingData,
-        query: ".topleftnav .spectrum-Tabs-item#builder-data-tab",
-        onLoad: async () => {
-          tourEvent(TOUR_STEP_KEYS.BUILDER_DATA_SECTION)
+    [TOUR_KEYS.TOUR_BUILDER_ONBOARDING]: {
+      onSkip: endUserOnboarding,
+      steps: [
+        {
+          id: TOUR_STEP_KEYS.BUILDER_DATA_SECTION,
+          title: "Data",
+          route: "/builder/app/:application/data",
+          layout: OnboardingData,
+          query: ".topleftnav .spectrum-Tabs-item#builder-data-tab",
+          onLoad: async () => {
+            tourEvent(TOUR_STEP_KEYS.BUILDER_DATA_SECTION)
+          },
+          align: "left",
         },
-        align: "left",
-      },
-      {
-        id: TOUR_STEP_KEYS.BUILDER_DESIGN_SECTION,
-        title: "Design",
-        route: "/builder/app/:application/design",
-        layout: OnboardingDesign,
-        query: ".topleftnav .spectrum-Tabs-item#builder-design-tab",
-        onLoad: () => {
-          tourEvent(TOUR_STEP_KEYS.BUILDER_DESIGN_SECTION)
+        {
+          id: TOUR_STEP_KEYS.BUILDER_DESIGN_SECTION,
+          title: "Design",
+          route: "/builder/app/:application/design",
+          layout: OnboardingDesign,
+          query: ".topleftnav .spectrum-Tabs-item#builder-design-tab",
+          onLoad: () => {
+            tourEvent(TOUR_STEP_KEYS.BUILDER_DESIGN_SECTION)
+          },
+          align: "left",
         },
-        align: "left",
-      },
-      {
-        id: TOUR_STEP_KEYS.BUILDER_AUTOMATION_SECTION,
-        title: "Automations",
-        route: "/builder/app/:application/automation",
-        query: ".topleftnav .spectrum-Tabs-item#builder-automation-tab",
-        body: "Once you have your app screens made, you can set up automations to fit in with your current workflow",
-        onLoad: () => {
-          tourEvent(TOUR_STEP_KEYS.BUILDER_AUTOMATION_SECTION)
+        {
+          id: TOUR_STEP_KEYS.BUILDER_AUTOMATION_SECTION,
+          title: "Automations",
+          route: "/builder/app/:application/automation",
+          query: ".topleftnav .spectrum-Tabs-item#builder-automation-tab",
+          body: "Once you have your app screens made, you can set up automations to fit in with your current workflow",
+          onLoad: () => {
+            tourEvent(TOUR_STEP_KEYS.BUILDER_AUTOMATION_SECTION)
+          },
+          align: "left",
         },
-        align: "left",
-      },
-      {
-        id: TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT,
-        title: "Users",
-        query: ".toprightnav #builder-app-users-button",
-        body: "Add users to your app and control what level of access they have.",
-        onLoad: () => {
-          tourEvent(TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT)
+        {
+          id: TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT,
+          title: "Users",
+          query: ".toprightnav #builder-app-users-button",
+          body: "Add users to your app and control what level of access they have.",
+          onLoad: () => {
+            tourEvent(TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT)
+          },
         },
-      },
-      {
-        id: TOUR_STEP_KEYS.BUILDER_APP_PUBLISH,
-        title: "Publish",
-        layout: OnboardingPublish,
-        route: "/builder/app/:application/design",
-        endRoute: "/builder/app/:application/data",
-        query: ".toprightnav #builder-app-publish-button",
-        onLoad: () => {
-          tourEvent(TOUR_STEP_KEYS.BUILDER_APP_PUBLISH)
+        {
+          id: TOUR_STEP_KEYS.BUILDER_APP_PUBLISH,
+          title: "Publish",
+          layout: OnboardingPublish,
+          route: "/builder/app/:application/design",
+          endRoute: "/builder/app/:application/data",
+          query: ".toprightnav #builder-app-publish-button",
+          onLoad: () => {
+            tourEvent(TOUR_STEP_KEYS.BUILDER_APP_PUBLISH)
+          },
+          onComplete: endUserOnboarding,
         },
-        onComplete: async () => {
-          // Mark the users onboarding as complete
-          // Clear all tour related state
-          if (get(auth).user) {
-            await API.updateSelf({
-              onboardedAt: new Date().toISOString(),
-            })
-
-            // Update the cached user
-            await auth.getSelf()
-
-            store.update(state => ({
-              ...state,
-              tourNodes: undefined,
-              tourKey: undefined,
-              tourKeyStep: undefined,
-              onboarding: false,
-            }))
-          }
+      ],
+    },
+    [TOUR_KEYS.FEATURE_ONBOARDING]: {
+      steps: [
+        {
+          id: TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT,
+          title: "Users",
+          query: ".toprightnav #builder-app-users-button",
+          body: "Add users to your app and control what level of access they have.",
+          onLoad: () => {
+            tourEvent(TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT)
+          },
+          onComplete: endUserOnboarding,
         },
-      },
-    ],
-    [TOUR_KEYS.FEATURE_ONBOARDING]: [
-      {
-        id: TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT,
-        title: "Users",
-        query: ".toprightnav #builder-app-users-button",
-        body: "Add users to your app and control what level of access they have.",
-        onLoad: () => {
-          tourEvent(TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT)
-        },
-        onComplete: async () => {
-          // Push the onboarding forward
-          if (get(auth).user) {
-            await API.updateSelf({
-              onboardedAt: new Date().toISOString(),
-            })
-
-            // Update the cached user
-            await auth.getSelf()
-
-            store.update(state => ({
-              ...state,
-              tourNodes: undefined,
-              tourKey: undefined,
-              tourKeyStep: undefined,
-              onboarding: false,
-            }))
-          }
-        },
-      },
-    ],
+      ],
+    },
   }
 }
 
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 8e637d6fa2..779b906587 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -91,7 +91,7 @@
         const activeNav = $layout.children.find(c => $isActive(c.path))
         const onboardingTour = TOURS[TOUR_KEYS.TOUR_BUILDER_ONBOARDING]
         const targetStep = activeNav
-          ? onboardingTour.find(step => step.route === activeNav?.path)
+          ? onboardingTour.steps.find(step => step.route === activeNav?.path)
           : null
         await store.update(state => ({
           ...state,

From 2ee3427645108a663c3a619f03c5ecccb6002b57 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 17 Jul 2023 16:14:40 +0100
Subject: [PATCH 08/35] Added eventing for the onboarding:skipped. Added a
 redirect to the data section when skipping. Moved endRoute to the tour level
 config

---
 .../portal/onboarding/TourPopover.svelte      | 38 ++++---------------
 .../src/components/portal/onboarding/tours.js | 14 +++++--
 .../builder/app/[application]/_layout.svelte  |  7 ----
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index 4607150c29..d514441815 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -15,14 +15,15 @@
   $: tourNodes = { ...$store.tourNodes }
   $: tourKey = $store.tourKey
   $: tourStepKey = $store.tourStepKey
-  $: tourOnSkip = TOURS[tourKey]?.onSkip
+  $: tour = TOURS[tourKey]
+  $: tourOnSkip = tour?.onSkip
 
   const updateTourStep = (targetStepKey, tourKey) => {
     if (!tourKey) {
       return
     }
     if (!tourSteps?.length) {
-      tourSteps = [...TOURS[tourKey].steps]
+      tourSteps = [...tour.steps]
     }
     tourStepIdx = getCurrentStepIdx(tourSteps, targetStepKey)
     lastStep = tourStepIdx + 1 == tourSteps.length
@@ -73,23 +74,8 @@
         tourStep.onComplete()
       }
       popover.hide()
-      if (tourStep.endRoute) {
-        $goto(tourStep.endRoute)
-      }
-    }
-  }
-
-  const previousStep = async () => {
-    if (tourStepIdx > 0) {
-      let target = tourSteps[tourStepIdx - 1]
-      if (target) {
-        store.update(state => ({
-          ...state,
-          tourStepKey: target.id,
-        }))
-        navigateStep(target)
-      } else {
-        console.log("Could not retrieve step")
+      if (tour.endRoute) {
+        $goto(tour.endRoute)
       }
     }
   }
@@ -135,22 +121,14 @@
           <div class="tour-footer">
             <div class="tour-navigation">
               {#if typeof tourOnSkip === "function"}
-                <!-- <Button
-                  secondary
-                  quiet
-                  on:click={() => {
-                    skipping = true
-                    tourOnSkip()
-                  }}
-                  disabled={skipping}
-                >
-                  Skip
-                </Button> -->
                 <Link
                   quiet
                   on:click={() => {
                     skipping = true
                     tourOnSkip()
+                    if (tour.endRoute) {
+                      $goto(tour.endRoute)
+                    }
                   }}
                   disabled={skipping}>Skip</Link
                 >
diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index 0fcefce6f4..2b2e4c1f88 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -4,6 +4,7 @@ import { auth } from "stores/portal"
 import analytics from "analytics"
 import { OnboardingData, OnboardingDesign, OnboardingPublish } from "./steps"
 import { API } from "api"
+
 const ONBOARDING_EVENT_PREFIX = "onboarding"
 
 export const TOUR_STEP_KEYS = {
@@ -20,8 +21,7 @@ export const TOUR_KEYS = {
   FEATURE_ONBOARDING: "feature-onboarding",
 }
 
-// TOUR_BUILDER_ONBOARDING - termination
-const endUserOnboarding = async () => {
+const endUserOnboarding = async ({ skipped = false }) => {
   // Mark the users onboarding as complete
   // Clear all tour related state
   if (get(auth).user) {
@@ -30,6 +30,10 @@ const endUserOnboarding = async () => {
         onboardedAt: new Date().toISOString(),
       })
 
+      if (skipped) {
+        tourEvent("skipped")
+      }
+
       // Update the cached user
       await auth.getSelf()
 
@@ -57,7 +61,6 @@ const tourEvent = eventKey => {
 const getTours = () => {
   return {
     [TOUR_KEYS.TOUR_BUILDER_ONBOARDING]: {
-      onSkip: endUserOnboarding,
       steps: [
         {
           id: TOUR_STEP_KEYS.BUILDER_DATA_SECTION,
@@ -106,7 +109,6 @@ const getTours = () => {
           title: "Publish",
           layout: OnboardingPublish,
           route: "/builder/app/:application/design",
-          endRoute: "/builder/app/:application/data",
           query: ".toprightnav #builder-app-publish-button",
           onLoad: () => {
             tourEvent(TOUR_STEP_KEYS.BUILDER_APP_PUBLISH)
@@ -114,6 +116,10 @@ const getTours = () => {
           onComplete: endUserOnboarding,
         },
       ],
+      onSkip: async () => {
+        await endUserOnboarding({ skipped: true })
+      },
+      endRoute: "/builder/app/:application/data",
     },
     [TOUR_KEYS.FEATURE_ONBOARDING]: {
       steps: [
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 779b906587..64e892e83c 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -87,17 +87,10 @@
     // Check if onboarding is enabled.
     if (isEnabled(TENANT_FEATURE_FLAGS.ONBOARDING_TOUR)) {
       if (!$auth.user?.onboardedAt) {
-        // Determine the correct step
-        const activeNav = $layout.children.find(c => $isActive(c.path))
-        const onboardingTour = TOURS[TOUR_KEYS.TOUR_BUILDER_ONBOARDING]
-        const targetStep = activeNav
-          ? onboardingTour.steps.find(step => step.route === activeNav?.path)
-          : null
         await store.update(state => ({
           ...state,
           onboarding: true,
           tourKey: TOUR_KEYS.TOUR_BUILDER_ONBOARDING,
-          tourStepKey: targetStep?.id,
         }))
       } else {
         // Feature tour date

From 19c73dc20e1bb96aae07b9bbc78d272bb4cabda4 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 17 Jul 2023 17:44:54 +0100
Subject: [PATCH 09/35] Fixes and linting

---
 packages/builder/src/components/portal/onboarding/tours.js      | 2 +-
 .../builder/src/pages/builder/app/[application]/_layout.svelte  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index 2b2e4c1f88..e82026da94 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -21,7 +21,7 @@ export const TOUR_KEYS = {
   FEATURE_ONBOARDING: "feature-onboarding",
 }
 
-const endUserOnboarding = async ({ skipped = false }) => {
+const endUserOnboarding = async ({ skipped = false } = {}) => {
   // Mark the users onboarding as complete
   // Clear all tour related state
   if (get(auth).user) {
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index b5c2943af7..92df771e38 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -27,7 +27,7 @@
   import TourPopover from "components/portal/onboarding/TourPopover.svelte"
   import BuilderSidePanel from "./_components/BuilderSidePanel.svelte"
   import UserAvatars from "./_components/UserAvatars.svelte"
-  import { TOUR_KEYS, TOURS } from "components/portal/onboarding/tours.js"
+  import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
   import PreviewOverlay from "./_components/PreviewOverlay.svelte"
 
   export let application

From 69e68e27a9b5def42710dac7cb9f2a480f55f4da Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 18 Jul 2023 09:42:32 +0100
Subject: [PATCH 10/35] Fixed import for the UserAvatars

---
 .../builder/src/pages/builder/app/[application]/_layout.svelte  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 92df771e38..872151b4a3 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -26,7 +26,7 @@
   import TourWrap from "components/portal/onboarding/TourWrap.svelte"
   import TourPopover from "components/portal/onboarding/TourPopover.svelte"
   import BuilderSidePanel from "./_components/BuilderSidePanel.svelte"
-  import UserAvatars from "./_components/UserAvatars.svelte"
+  import { UserAvatars } from "@budibase/frontend-core"
   import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
   import PreviewOverlay from "./_components/PreviewOverlay.svelte"
 

From cbc67c6fdb73e6292dc24a2204b30aad6c88a8bd Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 18 Jul 2023 09:53:47 +0100
Subject: [PATCH 11/35] Changed link to secondary to ensure it adapts correctly
 to the theme

---
 .../src/components/portal/onboarding/TourPopover.svelte   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index d514441815..d959a6ef95 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -122,6 +122,7 @@
             <div class="tour-navigation">
               {#if typeof tourOnSkip === "function"}
                 <Link
+                  secondary
                   quiet
                   on:click={() => {
                     skipping = true
@@ -130,8 +131,10 @@
                       $goto(tour.endRoute)
                     }
                   }}
-                  disabled={skipping}>Skip</Link
+                  disabled={skipping}
                 >
+                  Skip
+                </Link>
               {/if}
               <Button cta on:click={nextStep} disabled={skipping}>
                 <div>{lastStep ? "Finish" : "Next"}</div>
@@ -154,9 +157,6 @@
     justify-content: end;
     align-items: center;
   }
-  .tour-navigation :global(.spectrum-Link) {
-    color: white;
-  }
   .tour-body :global(.feature-list) {
     margin-bottom: 0px;
     padding-left: var(--spacing-xl);

From ea91605e2f772aba71cf67e458e7b74098f1c2e0 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 18 Jul 2023 13:48:23 +0100
Subject: [PATCH 12/35] Updates to account endpoint API testing

---
 .../src/account-api/api/apis/AccountAPI.ts    | 23 +++-----
 qa-core/src/account-api/api/apis/AuthAPI.ts   |  6 +-
 .../account-api/tests/accounts/create.spec.ts | 11 ++--
 .../account-api/tests/accounts/delete.spec.ts | 50 ++++++++++-------
 .../account-api/tests/accounts/search.spec.ts | 39 +++++++++++--
 .../tests/accounts/validate.spec.ts           | 37 ++++++++----
 .../account-api/tests/accounts/verify.spec.ts | 56 ++++++++++++-------
 qa-core/src/jest/globalSetup.ts               |  5 +-
 qa-core/src/types/api.ts                      |  3 +-
 9 files changed, 150 insertions(+), 80 deletions(-)

diff --git a/qa-core/src/account-api/api/apis/AccountAPI.ts b/qa-core/src/account-api/api/apis/AccountAPI.ts
index 37aa3313ba..9450f6b2cd 100644
--- a/qa-core/src/account-api/api/apis/AccountAPI.ts
+++ b/qa-core/src/account-api/api/apis/AccountAPI.ts
@@ -20,9 +20,6 @@ export default class AccountAPI {
         body: { email },
       }
     )
-    if (opts.doExpect) {
-      expect(response).toHaveStatusCode(200)
-    }
     return response
   }
 
@@ -36,18 +33,15 @@ export default class AccountAPI {
         body: { tenantId },
       }
     )
-    if (opts.doExpect) {
-      expect(response).toHaveStatusCode(200)
-    }
     return response
   }
 
   async create(
     body: CreateAccountRequest,
-    opts: APIRequestOpts = { doExpect: true }
+    opts: APIRequestOpts & { autoVerify: boolean } = { doExpect: true, autoVerify: true }
   ): Promise<[Response, Account]> {
     const headers = {
-      "no-verify": "1",
+      "no-verify": opts.autoVerify ? "1" : "0"
     }
     const [response, json] = await this.client.post(`/api/accounts`, {
       body,
@@ -59,7 +53,7 @@ export default class AccountAPI {
     return [response, json]
   }
 
-  async delete(accountID: string) {
+  async delete(accountID: string, opts: APIRequestOpts = {status:204}) {
     const [response, json] = await this.client.del(
       `/api/accounts/${accountID}`,
       {
@@ -67,8 +61,8 @@ export default class AccountAPI {
       }
     )
     // can't use expect here due to use in global teardown
-    if (response.status !== 204) {
-      throw new Error(`Could not delete accountId=${accountID}`)
+    if (response.status !== opts.status) {
+      throw new Error(`status: ${response.status} not equal to expected: ${opts.status}`)
     }
     return response
   }
@@ -120,18 +114,15 @@ export default class AccountAPI {
     let body: SearchAccountsRequest = {}
 
     if (search === 'email') {
-      body.email = searchType;
+      body.email = searchType
     } else if (search === 'tenantId') {
-      body.tenantId = searchType;
+      body.tenantId = searchType
     }
 
     const [response, json] = await this.client.post(
         `/api/accounts/search`,
         {body: body}
     )
-    if (opts.doExpect) {
-      expect(response).toHaveStatusCode(200)
-    }
     return [response, json]
   }
 }
diff --git a/qa-core/src/account-api/api/apis/AuthAPI.ts b/qa-core/src/account-api/api/apis/AuthAPI.ts
index 9c375d2b5d..5f2df6d250 100644
--- a/qa-core/src/account-api/api/apis/AuthAPI.ts
+++ b/qa-core/src/account-api/api/apis/AuthAPI.ts
@@ -23,9 +23,9 @@ export default class AuthAPI {
         },
       }
     )
-    if (opts.doExpect) {
-      expect(response).toHaveStatusCode(200)
-    }
+    // if (opts.doExpect) {
+    //   expect(response).toHaveStatusCode(200)
+    // }
     const cookie = response.headers.get("set-cookie")
     return [response, cookie!]
   }
diff --git a/qa-core/src/account-api/tests/accounts/create.spec.ts b/qa-core/src/account-api/tests/accounts/create.spec.ts
index 2c26c5170b..11a243a8ba 100644
--- a/qa-core/src/account-api/tests/accounts/create.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/create.spec.ts
@@ -12,9 +12,12 @@ describe("Account API - Create Account", () => {
         await config.afterAll()
     })
 
-    it("Creates a new account", async () => {
-        await config.api.accounts.create({
-             ...fixtures.accounts.generateAccount()
+    describe("POST /api/accounts/", () => {
+        it("Returns 201", async () => {
+            const [res, account] = await config.api.accounts.create({
+                ...fixtures.accounts.generateAccount()
+            })
+            expect(res.status).toBe(201)
         })
     })
-})
\ No newline at end of file
+})
diff --git a/qa-core/src/account-api/tests/accounts/delete.spec.ts b/qa-core/src/account-api/tests/accounts/delete.spec.ts
index 2d476d78c0..c3abeed12c 100644
--- a/qa-core/src/account-api/tests/accounts/delete.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/delete.spec.ts
@@ -1,5 +1,6 @@
 import TestConfiguration from "../../config/TestConfiguration"
 import * as fixtures from "../../fixtures"
+import { generator } from "../../../shared"
 
 describe("Account API - Delete Account", () => {
     const config = new TestConfiguration()
@@ -12,29 +13,40 @@ describe("Account API - Delete Account", () => {
         await config.afterAll()
     })
 
-    it("Deletes an account", async () => {
-        await config.doInNewState(async () => {
-            // Create account
-            const createAccountRequest = fixtures.accounts.generateAccount()
-            await config.api.accounts.create(createAccountRequest)
+    describe("DEL /api/accounts", () => {
+        it("Returns 204", async () => {
+            await config.doInNewState(async () => {
+                // Create account
+                const createAccountRequest = fixtures.accounts.generateAccount()
+                await config.api.accounts.create(createAccountRequest)
 
-            // Login - Get cookie
-            await config.login(
-              createAccountRequest.email,
-              createAccountRequest.password,
-              createAccountRequest.tenantId
-            )
+                // Login - Get cookie
+                await config.login(
+                    createAccountRequest.email,
+                    createAccountRequest.password,
+                    createAccountRequest.tenantId
+                )
 
-            // Delete account
-            const res = await config.api.accounts.deleteCurrentAccount()
+                // Delete account
+                const res = await config.api.accounts.deleteCurrentAccount()
+                expect(res.status).toBe(204)
+            })
+        })
+    })
+
+    describe("DEL /api/accounts/{accountId}", () => {
+        it("Returns 204", async () => {
+            const [response, account] = await config.api.accounts.create({
+                ...fixtures.accounts.generateAccount()
+            })
+            // Delete account by ID
+            const res = await config.api.accounts.delete(account.accountId)
             expect(res.status).toBe(204)
         })
-    })
 
-    it("Deletes an account by ID", async () => {
-        const [response, account] = await config.api.accounts.create({
-            ...fixtures.accounts.generateAccount()
+        it("returns 404 - Account not found", async () => {
+            const accountId = generator.string()
+            await config.api.accounts.delete(accountId, {status:404})
         })
-        await config.api.accounts.delete(account.accountId)
     })
-})
\ No newline at end of file
+})
diff --git a/qa-core/src/account-api/tests/accounts/search.spec.ts b/qa-core/src/account-api/tests/accounts/search.spec.ts
index a39cf8e325..d928c23996 100644
--- a/qa-core/src/account-api/tests/accounts/search.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/search.spec.ts
@@ -12,32 +12,59 @@ describe("Account API - Search for Account", () => {
         await config.afterAll()
     })
 
-
     describe("POST /api/accounts/search", () => {
         describe("by tenant", () => {
             it("returns 200 + empty", async () => {
                 const tenantId = generator.string()
-                const [res, body] = await config.api.accounts.search(tenantId, "tenantId")
+                const [res, body] =
+                    await config.api.accounts.search(tenantId, "tenantId")
                 expect(res.status).toBe(200)
                 expect(body.length).toBe(0)
             })
 
             it("returns 200 + found", async () => {
-                const [res, body] = await config.api.accounts.search(config.state.tenantId!, "tenantId")
+                const [res, body] =
+                    await config.api.accounts.search(config.state.tenantId!, "tenantId")
                 expect(res.status).toBe(200)
                 expect(body.length).toBe(1)
                 expect(body[0].tenantId).toBe(config.state.tenantId)
             })
+
+            it("returns 400 + error: Invalid body - tenantId is not allowed to be empty", async () => {
+                const [res, body] =
+                    await config.api.accounts.search("", "tenantId")
+                expect(body).toEqual({
+                    message: "Invalid body - \"tenantId\" is not allowed to be empty",
+                    status: 400
+                })
+            })
         })
 
         describe("by email", () => {
             it("returns 200 + empty", async () => {
-                await config.api.accounts.search(generator.word(), "email")
+                const email = generator.email()
+                const [res, body] =
+                    await config.api.accounts.search(email, "email")
+                expect(res.status).toBe(200)
+                expect(body.length).toBe(0)
             })
 
             it("returns 200 + found", async () => {
-                await config.api.accounts.search(generator.word(), "email")
+                const [res, body] =
+                    await config.api.accounts.search(config.state.email!, "email")
+                expect(res.status).toBe(200)
+                expect(body.length).toBe(1)
+                expect(body[0].email).toBe(config.state.email)
+            })
+
+            it("returns 400 + error: Invalid body - email is not allowed to be empty", async () => {
+                const [res, body] =
+                    await config.api.accounts.search("", "email")
+                expect(body).toEqual({
+                    message: "Invalid body - \"email\" is not allowed to be empty",
+                    status: 400
+                })
             })
         })
     })
-})
\ No newline at end of file
+})
diff --git a/qa-core/src/account-api/tests/accounts/validate.spec.ts b/qa-core/src/account-api/tests/accounts/validate.spec.ts
index 5794949eee..16a32ecbe0 100644
--- a/qa-core/src/account-api/tests/accounts/validate.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/validate.spec.ts
@@ -1,6 +1,6 @@
 import TestConfiguration from "../../config/TestConfiguration"
+import * as fixtures from "../../fixtures"
 import { generator } from "../../../shared"
-import * as fixtures from "../../fixtures";
 
 describe("Account API - Validate Account", () => {
     const config = new TestConfiguration()
@@ -13,17 +13,34 @@ describe("Account API - Validate Account", () => {
         await config.afterAll()
     })
 
-    const tenant = generator.word({length: 6})
-    const email = `${tenant}@budibase.com`
+    describe("POST /api/accounts/validate/email", () => {
+        it("Returns 200", async () => {
+            const email = generator.email()
+            const res = await config.api.accounts.validateEmail(email)
+            expect(res.status).toBe(200)
+        })
 
-
-    it("Validates an email", async () => {
-
-        await config.api.accounts.validateEmail(email)
+        it("returns 400", async () => {
+            const [response, account] = await config.api.accounts.create({
+                ...fixtures.accounts.generateAccount()
+            })
+            const res = await config.api.accounts.validateEmail(account.email)
+            expect(res.status).toBe(400)
+        })
     })
 
-    it("Validates a tenant ID", async () => {
+    describe("POST /api/accounts/validate/tenantId", () => {
+        it("Returns 200", async () => {
+            const res = await config.api.accounts.validateTenantId("randomtenant")
+            expect(res.status).toBe(200)
+        })
 
-        await config.api.accounts.validateTenantId(tenant)
+        it("Returns 400", async () => {
+            const [response, account] = await config.api.accounts.create({
+                ...fixtures.accounts.generateAccount()
+            })
+            const res = await config.api.accounts.validateTenantId(account.tenantId)
+            expect(res.status).toBe(400)
+        })
     })
-})
\ No newline at end of file
+})
diff --git a/qa-core/src/account-api/tests/accounts/verify.spec.ts b/qa-core/src/account-api/tests/accounts/verify.spec.ts
index 222c4cb4ea..6c14b4a4d9 100644
--- a/qa-core/src/account-api/tests/accounts/verify.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/verify.spec.ts
@@ -1,6 +1,5 @@
 import TestConfiguration from "../../config/TestConfiguration"
-import { generator } from "../../../shared"
-import * as fixtures from "../../fixtures";
+import * as fixtures from "../../fixtures"
 
 describe("Account API - Verify Account", () => {
     const config = new TestConfiguration()
@@ -13,26 +12,45 @@ describe("Account API - Verify Account", () => {
         await config.afterAll()
     })
 
+    describe("POST /api/accounts/verify", () => {
+        it("returns 200", async () => {
+            // Create unverified account
+            const createAccountRequest = fixtures.accounts.generateAccount()
+            const [res, acc] = await config.api.accounts.create(
+                createAccountRequest,
+                { doExpect: true, autoVerify: false })
 
-    it("Verify an account", async () => {
-        // Create account
-        await config.api.accounts.create({
-            ...fixtures.accounts.generateAccount()
+            // Attempt to log in using unverified account
+            const [loginResponse, cookie] = await config.accountsApi.auth.login(
+                createAccountRequest.email,
+                createAccountRequest.password,
+            )
+
+            // await config.login(
+            //     createAccountRequest.email,
+            //     createAccountRequest.password,
+            //     createAccountRequest.tenantId,
+            // )
+
+            // Expect response - cannot login via unverified account
+
+
+            // Verify account via code
+            // await config.api.accounts.verifyAccount()
+
+            // Expect response - login successful
         })
-        // Invite user
-
-        // Verify account via code
-        await config.api.accounts.verifyAccount()
     })
 
-    it("Send account verification email ", async () => {
-        // Create account
-        await config.api.accounts.create({
-            ...fixtures.accounts.generateAccount()
-        })
-        // Invite user
+    describe("POST /api/accounts/verify/send", () => {
+        it("Send account verification email ", async () => {
+            // Create account
+            await config.api.accounts.create({
+                ...fixtures.accounts.generateAccount()
+            })
 
-        // Verify account via email
-        await config.api.accounts.verifyAccountSendEmail()
+            // Verify account via email
+            //await config.api.accounts.verifyAccountSendEmail()
+        })
     })
-})
\ No newline at end of file
+})
diff --git a/qa-core/src/jest/globalSetup.ts b/qa-core/src/jest/globalSetup.ts
index e52f8cfe16..e11d0e4423 100644
--- a/qa-core/src/jest/globalSetup.ts
+++ b/qa-core/src/jest/globalSetup.ts
@@ -14,7 +14,7 @@ logging.LOG_CONTEXT = false
 const accountsApi = new AccountInternalAPI({})
 const internalApi = new BudibaseInternalAPI({})
 
-const API_OPTS: APIRequestOpts = { doExpect: false }
+const API_OPTS: APIRequestOpts = { doExpect: false}
 
 // @ts-ignore
 global.qa = {}
@@ -23,7 +23,8 @@ async function createAccount(): Promise<[CreateAccountRequest, Account]> {
   const account = fixtures.accounts.generateAccount()
   await accountsApi.accounts.validateEmail(account.email, API_OPTS)
   await accountsApi.accounts.validateTenantId(account.tenantId, API_OPTS)
-  const [res, newAccount] = await accountsApi.accounts.create(account, API_OPTS)
+  const [res, newAccount] = await accountsApi.accounts.create(
+      account, {...API_OPTS, autoVerify: true})
   await updateLicense(newAccount.accountId)
   return [account, newAccount]
 }
diff --git a/qa-core/src/types/api.ts b/qa-core/src/types/api.ts
index c94150d3eb..3d52445280 100644
--- a/qa-core/src/types/api.ts
+++ b/qa-core/src/types/api.ts
@@ -1,5 +1,6 @@
 export interface APIRequestOpts {
   // in some cases we need to bypass the expect assertion in an api call
   // e.g. during global setup where jest is not available
-  doExpect: boolean
+  doExpect?: boolean
+  status?: number
 }

From c5337c652a2ac6b81a07f0a1704b04c2775089fe Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 18 Jul 2023 21:13:17 +0100
Subject: [PATCH 13/35] Remove no longer needed `LOG_CONTEXT` setting on logger
 module, update qa-core to disable pino logger via env var, add configurable
 jest timeout via env var

---
 packages/backend-core/src/logging/index.ts     |  3 ---
 .../backend-core/src/logging/pino/logger.ts    | 17 +++++++----------
 qa-core/scripts/createEnv.js                   |  2 ++
 qa-core/src/jest/globalSetup.ts                | 18 +++++++++---------
 qa-core/src/jest/jestSetup.ts                  |  7 +++----
 5 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/packages/backend-core/src/logging/index.ts b/packages/backend-core/src/logging/index.ts
index b87062c478..49d643375d 100644
--- a/packages/backend-core/src/logging/index.ts
+++ b/packages/backend-core/src/logging/index.ts
@@ -1,6 +1,3 @@
 export * as correlation from "./correlation/correlation"
 export { logger } from "./pino/logger"
 export * from "./alerts"
-
-// turn off or on context logging i.e. tenantId, appId etc
-export let LOG_CONTEXT = true
diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts
index c96bc83e04..8a5de9372d 100644
--- a/packages/backend-core/src/logging/pino/logger.ts
+++ b/packages/backend-core/src/logging/pino/logger.ts
@@ -3,7 +3,6 @@ import pino, { LoggerOptions } from "pino"
 import * as context from "../../context"
 import * as correlation from "../correlation"
 import { IdentityType } from "@budibase/types"
-import { LOG_CONTEXT } from "../index"
 
 // LOGGER
 
@@ -83,15 +82,13 @@ if (!env.DISABLE_PINO_LOGGER) {
 
     let contextObject = {}
 
-    if (LOG_CONTEXT) {
-      contextObject = {
-        tenantId: getTenantId(),
-        appId: getAppId(),
-        automationId: getAutomationId(),
-        identityId: identity?._id,
-        identityType: identity?.type,
-        correlationId: correlation.getId(),
-      }
+    contextObject = {
+      tenantId: getTenantId(),
+      appId: getAppId(),
+      automationId: getAutomationId(),
+      identityId: identity?._id,
+      identityType: identity?.type,
+      correlationId: correlation.getId(),
     }
 
     const mergingObject: any = {
diff --git a/qa-core/scripts/createEnv.js b/qa-core/scripts/createEnv.js
index e5ab783735..ebb165f3a9 100644
--- a/qa-core/scripts/createEnv.js
+++ b/qa-core/scripts/createEnv.js
@@ -12,6 +12,8 @@ function init() {
       BB_ADMIN_USER_EMAIL: "admin",
       BB_ADMIN_USER_PASSWORD: "admin",
       LOG_LEVEL: "info",
+      JEST_TIMEOUT: "60000",
+      DISABLE_PINO_LOGGER: "1"
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {
diff --git a/qa-core/src/jest/globalSetup.ts b/qa-core/src/jest/globalSetup.ts
index e11d0e4423..68300cee26 100644
--- a/qa-core/src/jest/globalSetup.ts
+++ b/qa-core/src/jest/globalSetup.ts
@@ -1,5 +1,4 @@
-process.env.DISABLE_PINO_LOGGER = "1"
-import { DEFAULT_TENANT_ID, logging } from "@budibase/backend-core"
+import { DEFAULT_TENANT_ID } from "@budibase/backend-core"
 import { AccountInternalAPI } from "../account-api"
 import * as fixtures from "../internal-api/fixtures"
 import { BudibaseInternalAPI } from "../internal-api"
@@ -7,10 +6,6 @@ import { Account, CreateAccountRequest, Feature } from "@budibase/types"
 import env from "../environment"
 import { APIRequestOpts } from "../types"
 
-// turn off or on context logging i.e. tenantId, appId etc
-// it's not applicable for the qa run
-logging.LOG_CONTEXT = false
-
 const accountsApi = new AccountInternalAPI({})
 const internalApi = new BudibaseInternalAPI({})
 
@@ -24,7 +19,7 @@ async function createAccount(): Promise<[CreateAccountRequest, Account]> {
   await accountsApi.accounts.validateEmail(account.email, API_OPTS)
   await accountsApi.accounts.validateTenantId(account.tenantId, API_OPTS)
   const [res, newAccount] = await accountsApi.accounts.create(
-      account, {...API_OPTS, autoVerify: true})
+      account, {...API_OPTS, autoVerify: true })
   await updateLicense(newAccount.accountId)
   return [account, newAccount]
 }
@@ -32,7 +27,7 @@ async function createAccount(): Promise<[CreateAccountRequest, Account]> {
 const UNLIMITED = { value: -1 }
 
 async function updateLicense(accountId: string) {
-  await accountsApi.licenses.updateLicense(accountId, {
+  const [response] = await accountsApi.licenses.updateLicense(accountId, {
     overrides: {
       // add all features
       features: Object.values(Feature),
@@ -50,7 +45,12 @@ async function updateLicense(accountId: string) {
         },
       },
     },
-  })
+  }, { doExpect: false })
+  if (response.status !== 200) {
+    throw new Error(
+      `Could not update license for accountId=${accountId}: ${response.status}`
+    )
+  }
 }
 
 async function loginAsAdmin() {
diff --git a/qa-core/src/jest/jestSetup.ts b/qa-core/src/jest/jestSetup.ts
index 5c86d5fd24..928e547337 100644
--- a/qa-core/src/jest/jestSetup.ts
+++ b/qa-core/src/jest/jestSetup.ts
@@ -1,4 +1,3 @@
-import { logging } from "@budibase/backend-core"
-logging.LOG_CONTEXT = false
-
-jest.setTimeout(60000)
+const envTimeout = process.env.JEST_TIMEOUT
+const timeout = envTimeout && parseInt(envTimeout)
+jest.setTimeout(timeout || 60000)

From 944b6e0baae7f01f5de5e79ff9413edc3dd25ba5 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 18 Jul 2023 21:14:07 +0100
Subject: [PATCH 14/35] Update account api clients to consistently handle
 status code handling and return types

---
 .../src/account-api/api/apis/AccountAPI.ts    | 166 +++++++++---------
 qa-core/src/account-api/api/apis/AuthAPI.ts   |  33 ++--
 qa-core/src/account-api/api/apis/BaseAPI.ts   |  22 +++
 .../src/account-api/api/apis/LicenseAPI.ts    |  29 ++-
 4 files changed, 140 insertions(+), 110 deletions(-)
 create mode 100644 qa-core/src/account-api/api/apis/BaseAPI.ts

diff --git a/qa-core/src/account-api/api/apis/AccountAPI.ts b/qa-core/src/account-api/api/apis/AccountAPI.ts
index 9450f6b2cd..8c6ccec6b8 100644
--- a/qa-core/src/account-api/api/apis/AccountAPI.ts
+++ b/qa-core/src/account-api/api/apis/AccountAPI.ts
@@ -2,127 +2,135 @@ import { Response } from "node-fetch"
 import { Account, CreateAccountRequest, SearchAccountsRequest, SearchAccountsResponse } from "@budibase/types"
 import AccountInternalAPIClient from "../AccountInternalAPIClient"
 import { APIRequestOpts } from "../../../types"
+import { Header } from "@budibase/backend-core"
+import BaseAPI from "./BaseAPI"
 
-export default class AccountAPI {
+export default class AccountAPI extends BaseAPI {
   client: AccountInternalAPIClient
 
   constructor(client: AccountInternalAPIClient) {
+    super()
     this.client = client
   }
 
   async validateEmail(
     email: string,
-    opts: APIRequestOpts = { doExpect: true }
-  ): Promise<Response> {
-    const [response, json] = await this.client.post(
-      `/api/accounts/validate/email`,
-      {
-        body: { email },
-      }
-    )
-    return response
+    opts: APIRequestOpts = { status: 200 }
+  ) {
+    return this.doRequest(() => {
+      return this.client.post(
+        `/api/accounts/validate/email`,
+        {
+          body: { email },
+        }
+      )
+    }, opts)
   }
 
   async validateTenantId(
     tenantId: string,
-    opts: APIRequestOpts = { doExpect: true }
-  ): Promise<Response> {
-    const [response, json] = await this.client.post(
-      `/api/accounts/validate/tenantId`,
-      {
-        body: { tenantId },
-      }
-    )
-    return response
+    opts: APIRequestOpts = { status: 200 }
+  ) {
+    return this.doRequest(() => {
+      return this.client.post(
+        `/api/accounts/validate/tenantId`,
+        {
+          body: { tenantId },
+        }
+      )
+    }, opts)
   }
 
   async create(
     body: CreateAccountRequest,
-    opts: APIRequestOpts & { autoVerify: boolean } = { doExpect: true, autoVerify: true }
+    opts: APIRequestOpts & { autoVerify: boolean } = { status: 201, autoVerify: false }
   ): Promise<[Response, Account]> {
-    const headers = {
-      "no-verify": opts.autoVerify ? "1" : "0"
-    }
-    const [response, json] = await this.client.post(`/api/accounts`, {
-      body,
-      headers,
-    })
-    if (opts.doExpect) {
-      expect(response).toHaveStatusCode(201)
-    }
-    return [response, json]
-  }
-
-  async delete(accountID: string, opts: APIRequestOpts = {status:204}) {
-    const [response, json] = await this.client.del(
-      `/api/accounts/${accountID}`,
-      {
-        internal: true,
+    return this.doRequest(() => {
+      const headers = {
+        "no-verify": opts.autoVerify ? "1" : "0"
       }
-    )
-    // can't use expect here due to use in global teardown
-    if (response.status !== opts.status) {
-      throw new Error(`status: ${response.status} not equal to expected: ${opts.status}`)
-    }
-    return response
+      return this.client.post(`/api/accounts`, {
+        body,
+        headers,
+      })
+    }, opts)
   }
 
-  async deleteCurrentAccount() {
-    const [response, json] = await this.client.del(
+  async delete(
+    accountID: string,
+    opts: APIRequestOpts = { status: 204 }) {
+    return this.doRequest(() => {
+      return this.client.del(
+        `/api/accounts/${accountID}`,
+        {
+          internal: true,
+        }
+      )
+    }, opts)
+  }
+
+  async deleteCurrentAccount(
+    opts: APIRequestOpts = { status: 204 }
+  ) {
+    return this.doRequest(() => {
+      return this.client.del(
         `/api/accounts`
-    )
-    return response
+      )
+    }, opts)
   }
 
   async verifyAccount(
-      verificationCode: string,
-      opts: APIRequestOpts = { doExpect: true }
-  ): Promise<Response> {
-    const [response, json] = await this.client.post(
+    verificationCode: string,
+    opts: APIRequestOpts = { status: 200 }
+  ){
+    return this.doRequest(() => {
+      return this.client.post(
         `/api/accounts/verify`,
         {
           body: { verificationCode },
         }
-    )
-    if (opts.doExpect) {
-      expect(response).toHaveStatusCode(200)
-    }
-    return response
+      )
+    }, opts)
   }
 
-  async verifyAccountSendEmail(
+  async sendVerificationEmail(
       email: string,
-      opts: APIRequestOpts = { doExpect: true }
-  ): Promise<Response> {
-    const [response, json] = await this.client.post(
+      opts: APIRequestOpts = { status: 200 }
+  ): Promise<[Response, string]> {
+    return this.doRequest(async () => {
+      const [response] = await this.client.post(
         `/api/accounts/verify/send`,
         {
           body: { email },
+          headers: {
+            [Header.RETURN_VERIFICATION_CODE]: "1"
+          }
         }
-    )
-    if (opts.doExpect) {
-      expect(response).toHaveStatusCode(200)
-    }
-    return response
+      )
+      const code = response.headers.get(Header.VERIFICATION_CODE)
+      return [response, code]
+    }, opts)
   }
 
   async search(
       searchType: string,
       search: 'email' | 'tenantId',
-      opts: APIRequestOpts = { doExpect: true }
+      opts: APIRequestOpts = { status: 200 }
   ): Promise<[Response, SearchAccountsResponse]> {
-    let body: SearchAccountsRequest = {}
-
-    if (search === 'email') {
-      body.email = searchType
-    } else if (search === 'tenantId') {
-      body.tenantId = searchType
-    }
-
-    const [response, json] = await this.client.post(
+    return this.doRequest(() => {
+      let body: SearchAccountsRequest = {}
+      if (search === 'email') {
+        body.email = searchType
+      } else if (search === 'tenantId') {
+        body.tenantId = searchType
+      }
+      return this.client.post(
         `/api/accounts/search`,
-        {body: body}
-    )
-    return [response, json]
+        {
+          body,
+          internal: true
+        }
+      )
+    }, opts)
   }
 }
diff --git a/qa-core/src/account-api/api/apis/AuthAPI.ts b/qa-core/src/account-api/api/apis/AuthAPI.ts
index 5f2df6d250..c5d654ade0 100644
--- a/qa-core/src/account-api/api/apis/AuthAPI.ts
+++ b/qa-core/src/account-api/api/apis/AuthAPI.ts
@@ -1,32 +1,33 @@
 import { Response } from "node-fetch"
 import AccountInternalAPIClient from "../AccountInternalAPIClient"
 import { APIRequestOpts } from "../../../types"
+import BaseAPI from "./BaseAPI"
 
-export default class AuthAPI {
+export default class AuthAPI extends BaseAPI {
   client: AccountInternalAPIClient
 
   constructor(client: AccountInternalAPIClient) {
+    super()
     this.client = client
   }
 
   async login(
     email: string,
     password: string,
-    opts: APIRequestOpts = { doExpect: true }
+    opts: APIRequestOpts = { doExpect: true, status: 200 }
   ): Promise<[Response, string]> {
-    const [response, json] = await this.client.post(
-      `/api/auth/login`,
-      {
-        body: {
-          email: email,
-          password: password,
-        },
-      }
-    )
-    // if (opts.doExpect) {
-    //   expect(response).toHaveStatusCode(200)
-    // }
-    const cookie = response.headers.get("set-cookie")
-    return [response, cookie!]
+    return this.doRequest(async () => {
+      const [res] = await this.client.post(
+        `/api/auth/login`,
+        {
+          body: {
+            email: email,
+            password: password,
+          },
+        }
+      )
+      const cookie = res.headers.get("set-cookie")
+      return [res, cookie]
+    }, opts)
   }
 }
diff --git a/qa-core/src/account-api/api/apis/BaseAPI.ts b/qa-core/src/account-api/api/apis/BaseAPI.ts
new file mode 100644
index 0000000000..db0d921dd6
--- /dev/null
+++ b/qa-core/src/account-api/api/apis/BaseAPI.ts
@@ -0,0 +1,22 @@
+import { Response } from "node-fetch"
+import { APIRequestOpts } from "../../../types"
+
+// TODO: Add to LicenseAPI
+
+export default class BaseAPI {
+
+  async doRequest(
+    request: () => Promise<[Response, any]>,
+    opts: APIRequestOpts): Promise<[Response, any]> {
+    const [response, body] = await request()
+
+    // do expect on by default
+    if (opts.doExpect === undefined) {
+      opts.doExpect = true
+    }
+    if (opts.doExpect && opts.status) {
+      expect(response).toHaveStatusCode(opts.status)
+    }
+    return [response, body]
+  }
+}
\ No newline at end of file
diff --git a/qa-core/src/account-api/api/apis/LicenseAPI.ts b/qa-core/src/account-api/api/apis/LicenseAPI.ts
index e0601fe127..67e67edcb1 100644
--- a/qa-core/src/account-api/api/apis/LicenseAPI.ts
+++ b/qa-core/src/account-api/api/apis/LicenseAPI.ts
@@ -1,31 +1,30 @@
 import AccountInternalAPIClient from "../AccountInternalAPIClient"
 import { Account, UpdateLicenseRequest } from "@budibase/types"
 import { Response } from "node-fetch"
+import BaseAPI from "./BaseAPI"
+import { APIRequestOpts } from "../../../types"
 
-export default class LicenseAPI {
+export default class LicenseAPI extends BaseAPI {
   client: AccountInternalAPIClient
 
   constructor(client: AccountInternalAPIClient) {
+    super()
     this.client = client
   }
 
   async updateLicense(
     accountId: string,
-    body: UpdateLicenseRequest
+    body: UpdateLicenseRequest,
+    opts: APIRequestOpts = { status: 200 }
   ): Promise<[Response, Account]> {
-    const [response, json] = await this.client.put(
-      `/api/accounts/${accountId}/license`,
-      {
-        body,
-        internal: true,
-      }
-    )
-
-    if (response.status !== 200) {
-      throw new Error(
-        `Could not update license for accountId=${accountId}: ${response.status}`
+    return this.doRequest(() => {
+      return this.client.put(
+        `/api/accounts/${accountId}/license`,
+        {
+          body,
+          internal: true,
+        }
       )
-    }
-    return [response, json]
+    }, opts)
   }
 }

From 4dc558d3e9935c83ab00e702d421235ede8d88a5 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 18 Jul 2023 21:15:13 +0100
Subject: [PATCH 15/35] Restructure account tests to test signup and deletion
 as a single flow

---
 .../api/AccountInternalAPIClient.ts           |  6 +-
 qa-core/src/account-api/fixtures/accounts.ts  |  1 +
 .../tests/accounts/accounts.internal.spec.ts  | 29 +++++++
 .../tests/accounts/accounts.spec.ts           | 80 +++++++++++++++++++
 .../account-api/tests/accounts/create.spec.ts | 23 ------
 .../account-api/tests/accounts/delete.spec.ts | 52 ------------
 .../account-api/tests/accounts/search.spec.ts | 70 ----------------
 .../tests/accounts/validate.spec.ts           | 46 -----------
 .../account-api/tests/accounts/verify.spec.ts | 56 -------------
 qa-core/src/jest/globalTeardown.ts            |  7 +-
 .../src/shared/BudibaseTestConfiguration.ts   | 18 ++++-
 11 files changed, 133 insertions(+), 255 deletions(-)
 create mode 100644 qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
 create mode 100644 qa-core/src/account-api/tests/accounts/accounts.spec.ts
 delete mode 100644 qa-core/src/account-api/tests/accounts/create.spec.ts
 delete mode 100644 qa-core/src/account-api/tests/accounts/delete.spec.ts
 delete mode 100644 qa-core/src/account-api/tests/accounts/search.spec.ts
 delete mode 100644 qa-core/src/account-api/tests/accounts/validate.spec.ts
 delete mode 100644 qa-core/src/account-api/tests/accounts/verify.spec.ts

diff --git a/qa-core/src/account-api/api/AccountInternalAPIClient.ts b/qa-core/src/account-api/api/AccountInternalAPIClient.ts
index 85807fd87a..b1e32cac1f 100644
--- a/qa-core/src/account-api/api/AccountInternalAPIClient.ts
+++ b/qa-core/src/account-api/api/AccountInternalAPIClient.ts
@@ -1,6 +1,8 @@
+import { Response } from "node-fetch"
 import env from "../../environment"
 import fetch, { HeadersInit } from "node-fetch"
 import { State } from "../../types"
+import { Header } from "@budibase/backend-core"
 
 type APIMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE"
 
@@ -28,7 +30,7 @@ export default class AccountInternalAPIClient {
 
   apiCall =
     (method: APIMethod) =>
-    async (url = "", options: ApiOptions = {}) => {
+    async (url = "", options: ApiOptions = {}): Promise<[Response, any]> => {
       const requestOptions = {
         method,
         body: JSON.stringify(options.body),
@@ -46,7 +48,7 @@ export default class AccountInternalAPIClient {
       if (options.internal) {
         requestOptions.headers = {
           ...requestOptions.headers,
-          ...{ "x-budibase-api-key": env.ACCOUNT_PORTAL_API_KEY },
+          ...{ [Header.API_KEY] : env.ACCOUNT_PORTAL_API_KEY },
         }
       }
 
diff --git a/qa-core/src/account-api/fixtures/accounts.ts b/qa-core/src/account-api/fixtures/accounts.ts
index c6c6fa163f..6c52cb52b0 100644
--- a/qa-core/src/account-api/fixtures/accounts.ts
+++ b/qa-core/src/account-api/fixtures/accounts.ts
@@ -1,6 +1,7 @@
 import { generator } from "../../shared"
 import { Hosting, CreateAccountRequest } from "@budibase/types"
 
+// TODO: Refactor me to central location
 export const generateAccount = (): CreateAccountRequest => {
     const uuid = generator.guid()
 
diff --git a/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
new file mode 100644
index 0000000000..47b0ffb12a
--- /dev/null
+++ b/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
@@ -0,0 +1,29 @@
+import TestConfiguration from "../../config/TestConfiguration"
+import * as fixtures from "../../fixtures"
+import { generator } from "../../../shared"
+
+describe("Account Internal Operations", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    await config.beforeAll()
+  })
+
+  afterAll(async () => {
+    await config.afterAll()
+  })
+
+  it("performs account deletion", async () => {
+    // Deleting by unknown id doesn't work
+    const accountId = generator.string()
+    await config.api.accounts.delete(accountId, { status: 404 })
+
+    // Create new account
+    const [_, account] = await config.api.accounts.create({
+      ...fixtures.accounts.generateAccount(),
+    })
+
+    // New account can be deleted
+    await config.api.accounts.delete(account.accountId)
+  })
+})
diff --git a/qa-core/src/account-api/tests/accounts/accounts.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.spec.ts
new file mode 100644
index 0000000000..e61e2089c2
--- /dev/null
+++ b/qa-core/src/account-api/tests/accounts/accounts.spec.ts
@@ -0,0 +1,80 @@
+import TestConfiguration from "../../config/TestConfiguration"
+import * as fixtures from "../../fixtures"
+import { generator } from "../../../shared"
+
+describe("accounts", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    await config.beforeAll()
+  })
+
+  afterAll(async () => {
+    await config.afterAll()
+  })
+
+  it("performs signup and deletion flow", async () => {
+    await config.doInNewState(async () => {
+      const createAccountRequest = fixtures.accounts.generateAccount()
+      const email = createAccountRequest.email
+      const tenantId = createAccountRequest.tenantId
+
+      // Validation - email and tenant id allowed
+      await config.api.accounts.validateEmail(email)
+      await config.api.accounts.validateTenantId(tenantId)
+
+      // Create unverified account
+      await config.api.accounts.create(createAccountRequest)
+
+      // Validation - email and tenant id no longer valid
+      await config.api.accounts.validateEmail(email, { status: 400 })
+      await config.api.accounts.validateTenantId(tenantId, { status: 400 })
+
+      // Attempt to log in using unverified account
+      await config.loginAsAccount(createAccountRequest, { status: 400 })
+
+      // Re-send verification email to get access to code
+      const [_, code] = await config.accountsApi.accounts.sendVerificationEmail(email)
+
+      // Send the verification request
+      await config.accountsApi.accounts.verifyAccount(code!)
+
+      // Can now login to the account
+      await config.loginAsAccount(createAccountRequest)
+
+      // Delete account
+      await config.api.accounts.deleteCurrentAccount()
+
+      // Can't login
+      await config.loginAsAccount(createAccountRequest, { status: 403 })
+    })
+  })
+
+  describe("searching accounts", () => {
+    it("searches by tenant id", async () => {
+      const tenantId = generator.string()
+
+      // empty result
+      const [emptyRes, emptyBody] = await config.api.accounts.search(tenantId, "tenantId")
+      expect(emptyBody.length).toBe(0)
+
+      // hit result
+      const [hitRes, hitBody] = await config.api.accounts.search(config.state.tenantId!, "tenantId")
+      expect(hitBody.length).toBe(1)
+      expect(hitBody[0].tenantId).toBe(config.state.tenantId)
+    })
+
+    it("searches by email", async () => {
+      const email = generator.email()
+
+      // empty result
+      const [emptyRes, emptyBody] = await config.api.accounts.search(email, "email")
+      expect(emptyBody.length).toBe(0)
+
+      // hit result
+      const [hitRes, hitBody] = await config.api.accounts.search(config.state.email!, "email")
+      expect(hitBody.length).toBe(1)
+      expect(hitBody[0].email).toBe(config.state.email)
+    })
+  })
+})
diff --git a/qa-core/src/account-api/tests/accounts/create.spec.ts b/qa-core/src/account-api/tests/accounts/create.spec.ts
deleted file mode 100644
index 11a243a8ba..0000000000
--- a/qa-core/src/account-api/tests/accounts/create.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import TestConfiguration from "../../config/TestConfiguration"
-import * as fixtures from "../../fixtures"
-
-describe("Account API - Create Account", () => {
-    const config = new TestConfiguration()
-
-    beforeAll(async () => {
-        await config.beforeAll()
-    })
-
-    afterAll(async () => {
-        await config.afterAll()
-    })
-
-    describe("POST /api/accounts/", () => {
-        it("Returns 201", async () => {
-            const [res, account] = await config.api.accounts.create({
-                ...fixtures.accounts.generateAccount()
-            })
-            expect(res.status).toBe(201)
-        })
-    })
-})
diff --git a/qa-core/src/account-api/tests/accounts/delete.spec.ts b/qa-core/src/account-api/tests/accounts/delete.spec.ts
deleted file mode 100644
index c3abeed12c..0000000000
--- a/qa-core/src/account-api/tests/accounts/delete.spec.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import TestConfiguration from "../../config/TestConfiguration"
-import * as fixtures from "../../fixtures"
-import { generator } from "../../../shared"
-
-describe("Account API - Delete Account", () => {
-    const config = new TestConfiguration()
-
-    beforeAll(async () => {
-        await config.beforeAll()
-    })
-
-    afterAll(async () => {
-        await config.afterAll()
-    })
-
-    describe("DEL /api/accounts", () => {
-        it("Returns 204", async () => {
-            await config.doInNewState(async () => {
-                // Create account
-                const createAccountRequest = fixtures.accounts.generateAccount()
-                await config.api.accounts.create(createAccountRequest)
-
-                // Login - Get cookie
-                await config.login(
-                    createAccountRequest.email,
-                    createAccountRequest.password,
-                    createAccountRequest.tenantId
-                )
-
-                // Delete account
-                const res = await config.api.accounts.deleteCurrentAccount()
-                expect(res.status).toBe(204)
-            })
-        })
-    })
-
-    describe("DEL /api/accounts/{accountId}", () => {
-        it("Returns 204", async () => {
-            const [response, account] = await config.api.accounts.create({
-                ...fixtures.accounts.generateAccount()
-            })
-            // Delete account by ID
-            const res = await config.api.accounts.delete(account.accountId)
-            expect(res.status).toBe(204)
-        })
-
-        it("returns 404 - Account not found", async () => {
-            const accountId = generator.string()
-            await config.api.accounts.delete(accountId, {status:404})
-        })
-    })
-})
diff --git a/qa-core/src/account-api/tests/accounts/search.spec.ts b/qa-core/src/account-api/tests/accounts/search.spec.ts
deleted file mode 100644
index d928c23996..0000000000
--- a/qa-core/src/account-api/tests/accounts/search.spec.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import TestConfiguration from "../../config/TestConfiguration"
-import { generator } from "../../../shared"
-
-describe("Account API - Search for Account", () => {
-    const config = new TestConfiguration()
-
-    beforeAll(async () => {
-        await config.beforeAll()
-    })
-
-    afterAll(async () => {
-        await config.afterAll()
-    })
-
-    describe("POST /api/accounts/search", () => {
-        describe("by tenant", () => {
-            it("returns 200 + empty", async () => {
-                const tenantId = generator.string()
-                const [res, body] =
-                    await config.api.accounts.search(tenantId, "tenantId")
-                expect(res.status).toBe(200)
-                expect(body.length).toBe(0)
-            })
-
-            it("returns 200 + found", async () => {
-                const [res, body] =
-                    await config.api.accounts.search(config.state.tenantId!, "tenantId")
-                expect(res.status).toBe(200)
-                expect(body.length).toBe(1)
-                expect(body[0].tenantId).toBe(config.state.tenantId)
-            })
-
-            it("returns 400 + error: Invalid body - tenantId is not allowed to be empty", async () => {
-                const [res, body] =
-                    await config.api.accounts.search("", "tenantId")
-                expect(body).toEqual({
-                    message: "Invalid body - \"tenantId\" is not allowed to be empty",
-                    status: 400
-                })
-            })
-        })
-
-        describe("by email", () => {
-            it("returns 200 + empty", async () => {
-                const email = generator.email()
-                const [res, body] =
-                    await config.api.accounts.search(email, "email")
-                expect(res.status).toBe(200)
-                expect(body.length).toBe(0)
-            })
-
-            it("returns 200 + found", async () => {
-                const [res, body] =
-                    await config.api.accounts.search(config.state.email!, "email")
-                expect(res.status).toBe(200)
-                expect(body.length).toBe(1)
-                expect(body[0].email).toBe(config.state.email)
-            })
-
-            it("returns 400 + error: Invalid body - email is not allowed to be empty", async () => {
-                const [res, body] =
-                    await config.api.accounts.search("", "email")
-                expect(body).toEqual({
-                    message: "Invalid body - \"email\" is not allowed to be empty",
-                    status: 400
-                })
-            })
-        })
-    })
-})
diff --git a/qa-core/src/account-api/tests/accounts/validate.spec.ts b/qa-core/src/account-api/tests/accounts/validate.spec.ts
deleted file mode 100644
index 16a32ecbe0..0000000000
--- a/qa-core/src/account-api/tests/accounts/validate.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import TestConfiguration from "../../config/TestConfiguration"
-import * as fixtures from "../../fixtures"
-import { generator } from "../../../shared"
-
-describe("Account API - Validate Account", () => {
-    const config = new TestConfiguration()
-
-    beforeAll(async () => {
-        await config.beforeAll()
-    })
-
-    afterAll(async () => {
-        await config.afterAll()
-    })
-
-    describe("POST /api/accounts/validate/email", () => {
-        it("Returns 200", async () => {
-            const email = generator.email()
-            const res = await config.api.accounts.validateEmail(email)
-            expect(res.status).toBe(200)
-        })
-
-        it("returns 400", async () => {
-            const [response, account] = await config.api.accounts.create({
-                ...fixtures.accounts.generateAccount()
-            })
-            const res = await config.api.accounts.validateEmail(account.email)
-            expect(res.status).toBe(400)
-        })
-    })
-
-    describe("POST /api/accounts/validate/tenantId", () => {
-        it("Returns 200", async () => {
-            const res = await config.api.accounts.validateTenantId("randomtenant")
-            expect(res.status).toBe(200)
-        })
-
-        it("Returns 400", async () => {
-            const [response, account] = await config.api.accounts.create({
-                ...fixtures.accounts.generateAccount()
-            })
-            const res = await config.api.accounts.validateTenantId(account.tenantId)
-            expect(res.status).toBe(400)
-        })
-    })
-})
diff --git a/qa-core/src/account-api/tests/accounts/verify.spec.ts b/qa-core/src/account-api/tests/accounts/verify.spec.ts
deleted file mode 100644
index 6c14b4a4d9..0000000000
--- a/qa-core/src/account-api/tests/accounts/verify.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import TestConfiguration from "../../config/TestConfiguration"
-import * as fixtures from "../../fixtures"
-
-describe("Account API - Verify Account", () => {
-    const config = new TestConfiguration()
-
-    beforeAll(async () => {
-        await config.beforeAll()
-    })
-
-    afterAll(async () => {
-        await config.afterAll()
-    })
-
-    describe("POST /api/accounts/verify", () => {
-        it("returns 200", async () => {
-            // Create unverified account
-            const createAccountRequest = fixtures.accounts.generateAccount()
-            const [res, acc] = await config.api.accounts.create(
-                createAccountRequest,
-                { doExpect: true, autoVerify: false })
-
-            // Attempt to log in using unverified account
-            const [loginResponse, cookie] = await config.accountsApi.auth.login(
-                createAccountRequest.email,
-                createAccountRequest.password,
-            )
-
-            // await config.login(
-            //     createAccountRequest.email,
-            //     createAccountRequest.password,
-            //     createAccountRequest.tenantId,
-            // )
-
-            // Expect response - cannot login via unverified account
-
-
-            // Verify account via code
-            // await config.api.accounts.verifyAccount()
-
-            // Expect response - login successful
-        })
-    })
-
-    describe("POST /api/accounts/verify/send", () => {
-        it("Send account verification email ", async () => {
-            // Create account
-            await config.api.accounts.create({
-                ...fixtures.accounts.generateAccount()
-            })
-
-            // Verify account via email
-            //await config.api.accounts.verifyAccountSendEmail()
-        })
-    })
-})
diff --git a/qa-core/src/jest/globalTeardown.ts b/qa-core/src/jest/globalTeardown.ts
index 52696a72f8..f1b8c1d541 100644
--- a/qa-core/src/jest/globalTeardown.ts
+++ b/qa-core/src/jest/globalTeardown.ts
@@ -10,8 +10,11 @@ const API_OPTS: APIRequestOpts = { doExpect: false }
 async function deleteAccount() {
   // @ts-ignore
   const accountID = global.qa.accountId
-  // can't run 'expect' blocks in teardown
-  await accountsApi.accounts.delete(accountID)
+
+  const [response] = await accountsApi.accounts.delete(accountID, { doExpect: false })
+  if (response.status !== 204) {
+    throw new Error(`status: ${response.status} not equal to expected: 201`)
+  }
 }
 
 async function teardown() {
diff --git a/qa-core/src/shared/BudibaseTestConfiguration.ts b/qa-core/src/shared/BudibaseTestConfiguration.ts
index c6955fd87f..9841b8d163 100644
--- a/qa-core/src/shared/BudibaseTestConfiguration.ts
+++ b/qa-core/src/shared/BudibaseTestConfiguration.ts
@@ -1,7 +1,8 @@
 import { BudibaseInternalAPI } from "../internal-api"
 import { AccountInternalAPI } from "../account-api"
-import { CreateAppRequest, State } from "../types"
+import { APIRequestOpts, CreateAppRequest, State } from "../types"
 import * as fixtures from "../internal-api/fixtures"
+import { CreateAccountRequest } from "@budibase/types"
 
 export default class BudibaseTestConfiguration {
   // apis
@@ -42,12 +43,12 @@ export default class BudibaseTestConfiguration {
 
   // AUTH
 
-  async doInNewState(task: any) {
+  async doInNewState(task: () => Promise<any>) {
     return this.doWithState(task, {})
   }
 
-  async doWithState(task: any, state: State) {
-    const original = this.state
+  async doWithState(task: () => Promise<any>, state: State) {
+    const original = { ...this.state }
 
     // override the state
     this.state.apiKey = state.apiKey
@@ -68,6 +69,15 @@ export default class BudibaseTestConfiguration {
     this.state.email = original.email
   }
 
+  async loginAsAccount(account: CreateAccountRequest, opts: APIRequestOpts = {}) {
+    const [_, cookie] = await this.accountsApi.auth.login(
+      account.email,
+      account.password,
+      opts
+    )
+    this.state.cookie = cookie
+  }
+
   async login(email: string, password: string, tenantId?: string) {
     if (!tenantId && this.state.tenantId) {
       tenantId = this.state.tenantId

From e7d304d4cfa2169b398d3652372aaecbc12c1eef Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 18 Jul 2023 21:15:44 +0100
Subject: [PATCH 16/35] Add swc transformer to make tests start faster

---
 qa-core/jest.config.ts |   3 ++
 qa-core/package.json   |   2 +
 qa-core/yarn.lock      | 104 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/qa-core/jest.config.ts b/qa-core/jest.config.ts
index de63f9074b..eb942eca97 100644
--- a/qa-core/jest.config.ts
+++ b/qa-core/jest.config.ts
@@ -5,6 +5,9 @@ const config: Config.InitialOptions = {
   setupFiles: ["./src/jest/jestSetup.ts"],
   setupFilesAfterEnv: ["./src/jest/jest.extends.ts"],
   testEnvironment: "node",
+  transform: {
+    "^.+\\.ts?$": "@swc/jest",
+  },
   globalSetup: "./src/jest/globalSetup.ts",
   globalTeardown: "./src/jest/globalTeardown.ts",
   moduleNameMapper: {
diff --git a/qa-core/package.json b/qa-core/package.json
index 13f2e80332..555b277742 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -30,6 +30,8 @@
     "jest": "29.0.0",
     "prettier": "2.7.1",
     "start-server-and-test": "1.14.0",
+    "@swc/core": "^1.3.25",
+    "@swc/jest": "^0.2.24",
     "timekeeper": "2.2.0",
     "ts-jest": "29.0.0",
     "ts-node": "10.8.1",
diff --git a/qa-core/yarn.lock b/qa-core/yarn.lock
index a2cfae27a9..a423e45b21 100644
--- a/qa-core/yarn.lock
+++ b/qa-core/yarn.lock
@@ -455,6 +455,13 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
+"@jest/create-cache-key-function@^27.4.2":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-27.5.1.tgz#7448fae15602ea95c828f5eceed35c202a820b31"
+  integrity sha512-dmH1yW+makpTSURTy8VzdUwFnfQh1G8R+DxO2Ho2FFmBbKFEVm+3jWdvFhE2VqB/LATCTokkP0dotjyQyw5/AQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+
 "@jest/environment@^29.5.0":
   version "29.5.0"
   resolved "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz"
@@ -589,6 +596,17 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
+"@jest/types@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^16.0.0"
+    chalk "^4.0.0"
+
 "@jest/types@^29.0.0", "@jest/types@^29.5.0":
   version "29.5.0"
   resolved "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz"
@@ -738,6 +756,80 @@
   dependencies:
     "@sinonjs/commons" "^2.0.0"
 
+"@swc/core-darwin-arm64@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.70.tgz#056ac6899e22cb7f7be21388d4d938ca5123a72b"
+  integrity sha512-31+mcl0dgdRHvZRjhLOK9V6B+qJ7nxDZYINr9pBlqGWxknz37Vld5KK19Kpr79r0dXUZvaaelLjCnJk9dA2PcQ==
+
+"@swc/core-darwin-x64@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.70.tgz#3945814de6fadbee5b46cb2a3422353acb420c5c"
+  integrity sha512-GMFJ65E18zQC80t0os+TZvI+8lbRuitncWVge/RXmXbVLPRcdykP4EJ87cqzcG5Ah0z18/E0T+ixD6jHRisrYQ==
+
+"@swc/core-linux-arm-gnueabihf@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.70.tgz#7960e54ede1af75a7ef99ee53febf37fea6269a8"
+  integrity sha512-wjhCwS8LCiAq2VedF1b4Bryyw68xZnfMED4pLRazAl8BaUlDFANfRBORNunxlfHQj4V3x39IaiLgCZRHMdzXBg==
+
+"@swc/core-linux-arm64-gnu@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.70.tgz#df9654e5040bbeb1619739756a7f50100e38ace8"
+  integrity sha512-9D/Rx67cAOnMiexvCqARxvhj7coRajTp5HlJHuf+rfwMqI2hLhpO9/pBMQxBUAWxODO/ksQ/OF+GJRjmtWw/2A==
+
+"@swc/core-linux-arm64-musl@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.70.tgz#2c2aab5a136c7eb409ddc9cdc4f947a68fd74493"
+  integrity sha512-gkjxBio7XD+1GlQVVyPP/qeFkLu83VhRHXaUrkNYpr5UZG9zZurBERT9nkS6Y+ouYh+Q9xmw57aIyd2KvD2zqQ==
+
+"@swc/core-linux-x64-gnu@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.70.tgz#774351532b154ed36a5c6d14b647e7a8ab510028"
+  integrity sha512-/nCly+V4xfMVwfEUoLLAukxUSot/RcSzsf6GdsGTjFcrp5sZIntAjokYRytm3VT1c2TK321AfBorsi9R5w8Y7Q==
+
+"@swc/core-linux-x64-musl@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.70.tgz#c0b1b4ad5f4ef187eaa093589a4933ecb6836546"
+  integrity sha512-HoOsPJbt361KGKaivAK0qIiYARkhzlxeAfvF5NlnKxkIMOZpQ46Lwj3tR0VWohKbrhS+cYKFlVuDi5XnDkx0XA==
+
+"@swc/core-win32-arm64-msvc@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.70.tgz#8640267ce3959db0e7e682103677a5e0500b5ea7"
+  integrity sha512-hm4IBK/IaRil+aj1cWU6f0GyAdHpw/Jr5nyFYLM2c/tt7w2t5hgb8NjzM2iM84lOClrig1fG6edj2vCF1dFzNQ==
+
+"@swc/core-win32-ia32-msvc@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.70.tgz#f95d5656622f5a963bc0125da9fda84cf40faa8d"
+  integrity sha512-5cgKUKIT/9Fp5fCA+zIjYCQ4dSvjFYOeWGZR3QiTXGkC4bGa1Ji9SEPyeIAX0iruUnKjYaZB9RvHK2tNn7RLrQ==
+
+"@swc/core-win32-x64-msvc@1.3.70":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.70.tgz#5b3acddb96fdf60df089b837061915cb4be94eaa"
+  integrity sha512-LE8lW46+TQBzVkn2mHBlk8DIElPIZ2dO5P8AbJiARNBAnlqQWu67l9gWM89UiZ2l33J2cI37pHzON3tKnT8f9g==
+
+"@swc/core@^1.3.25":
+  version "1.3.70"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.70.tgz#f5ddc6fe6add7a99f5b94d2214ad0d8527d11479"
+  integrity sha512-LWVWlEDLlOD25PvA2NEz41UzdwXnlDyBiZbe69s3zM0DfCPwZXLUm79uSqH9ItsOjTrXSL5/1+XUL6C/BZwChA==
+  optionalDependencies:
+    "@swc/core-darwin-arm64" "1.3.70"
+    "@swc/core-darwin-x64" "1.3.70"
+    "@swc/core-linux-arm-gnueabihf" "1.3.70"
+    "@swc/core-linux-arm64-gnu" "1.3.70"
+    "@swc/core-linux-arm64-musl" "1.3.70"
+    "@swc/core-linux-x64-gnu" "1.3.70"
+    "@swc/core-linux-x64-musl" "1.3.70"
+    "@swc/core-win32-arm64-msvc" "1.3.70"
+    "@swc/core-win32-ia32-msvc" "1.3.70"
+    "@swc/core-win32-x64-msvc" "1.3.70"
+
+"@swc/jest@^0.2.24":
+  version "0.2.26"
+  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.26.tgz#6ef2d6d31869e3aaddc132603bc21f2e4c57cc5d"
+  integrity sha512-7lAi7q7ShTO3E5Gt1Xqf3pIhRbERxR1DUxvtVa9WKzIB+HGQ7wZP5sYx86zqnaEoKKGhmOoZ7gyW0IRu8Br5+A==
+  dependencies:
+    "@jest/create-cache-key-function" "^27.4.2"
+    jsonc-parser "^3.2.0"
+
 "@techpass/passport-openidconnect@0.3.2":
   version "0.3.2"
   resolved "https://registry.npmjs.org/@techpass/passport-openidconnect/-/passport-openidconnect-0.3.2.tgz"
@@ -885,6 +977,13 @@
   resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
+"@types/yargs@^16.0.0":
+  version "16.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.5.tgz#12cc86393985735a283e387936398c2f9e5f88e3"
+  integrity sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/yargs@^17.0.8":
   version "17.0.22"
   resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.22.tgz"
@@ -2866,6 +2965,11 @@ json5@^2.2.1, json5@^2.2.2:
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonc-parser@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
+
 jsonwebtoken@9.0.0:
   version "9.0.0"
   resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"

From b01c800d08c768bb97cd2c0336e00286399e1e31 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 19 Jul 2023 15:18:02 +0100
Subject: [PATCH 17/35] Updating comments

---
 .../tests/accounts/accounts.internal.spec.ts  |  2 +-
 .../tests/accounts/accounts.spec.ts           | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
index 47b0ffb12a..fc5eb57de7 100644
--- a/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
@@ -13,7 +13,7 @@ describe("Account Internal Operations", () => {
     await config.afterAll()
   })
 
-  it("performs account deletion", async () => {
+  it("performs account deletion by ID", async () => {
     // Deleting by unknown id doesn't work
     const accountId = generator.string()
     await config.api.accounts.delete(accountId, { status: 404 })
diff --git a/qa-core/src/account-api/tests/accounts/accounts.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.spec.ts
index e61e2089c2..e1c0dd2c20 100644
--- a/qa-core/src/account-api/tests/accounts/accounts.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/accounts.spec.ts
@@ -2,7 +2,7 @@ import TestConfiguration from "../../config/TestConfiguration"
 import * as fixtures from "../../fixtures"
 import { generator } from "../../../shared"
 
-describe("accounts", () => {
+describe("Accounts", () => {
   const config = new TestConfiguration()
 
   beforeAll(async () => {
@@ -15,18 +15,19 @@ describe("accounts", () => {
 
   it("performs signup and deletion flow", async () => {
     await config.doInNewState(async () => {
+      // Create account
       const createAccountRequest = fixtures.accounts.generateAccount()
       const email = createAccountRequest.email
       const tenantId = createAccountRequest.tenantId
 
-      // Validation - email and tenant id allowed
+      // Validation - email and tenant ID allowed
       await config.api.accounts.validateEmail(email)
       await config.api.accounts.validateTenantId(tenantId)
 
       // Create unverified account
       await config.api.accounts.create(createAccountRequest)
 
-      // Validation - email and tenant id no longer valid
+      // Validation - email and tenant ID no longer valid
       await config.api.accounts.validateEmail(email, { status: 400 })
       await config.api.accounts.validateTenantId(tenantId, { status: 400 })
 
@@ -39,26 +40,26 @@ describe("accounts", () => {
       // Send the verification request
       await config.accountsApi.accounts.verifyAccount(code!)
 
-      // Can now login to the account
+      // Can now log in to the account
       await config.loginAsAccount(createAccountRequest)
 
       // Delete account
       await config.api.accounts.deleteCurrentAccount()
 
-      // Can't login
+      // Can't log in
       await config.loginAsAccount(createAccountRequest, { status: 403 })
     })
   })
 
-  describe("searching accounts", () => {
-    it("searches by tenant id", async () => {
+  describe("Searching accounts", () => {
+    it("search by tenant ID", async () => {
       const tenantId = generator.string()
 
-      // empty result
-      const [emptyRes, emptyBody] = await config.api.accounts.search(tenantId, "tenantId")
+      // Empty result
+      const [_, emptyBody] = await config.api.accounts.search(tenantId, "tenantId")
       expect(emptyBody.length).toBe(0)
 
-      // hit result
+      // Hit result
       const [hitRes, hitBody] = await config.api.accounts.search(config.state.tenantId!, "tenantId")
       expect(hitBody.length).toBe(1)
       expect(hitBody[0].tenantId).toBe(config.state.tenantId)
@@ -67,11 +68,11 @@ describe("accounts", () => {
     it("searches by email", async () => {
       const email = generator.email()
 
-      // empty result
-      const [emptyRes, emptyBody] = await config.api.accounts.search(email, "email")
+      // Empty result
+      const [_, emptyBody] = await config.api.accounts.search(email, "email")
       expect(emptyBody.length).toBe(0)
 
-      // hit result
+      // Hit result
       const [hitRes, hitBody] = await config.api.accounts.search(config.state.email!, "email")
       expect(hitBody.length).toBe(1)
       expect(hitBody[0].email).toBe(config.state.email)

From ecf75a96857ce1cb454f749bbc65df7b1828880c Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 19 Jul 2023 15:42:12 +0100
Subject: [PATCH 18/35] lint

---
 packages/types/src/api/account/accounts.ts    |   2 +-
 qa-core/scripts/createEnv.js                  |   2 +-
 .../api/AccountInternalAPIClient.ts           |   2 +-
 .../src/account-api/api/apis/AccountAPI.ts    | 109 ++++++++----------
 qa-core/src/account-api/api/apis/AuthAPI.ts   |  15 +--
 qa-core/src/account-api/api/apis/BaseAPI.ts   |   6 +-
 .../src/account-api/api/apis/LicenseAPI.ts    |  11 +-
 .../account-api/config/TestConfiguration.ts   |  38 +++---
 qa-core/src/account-api/fixtures/accounts.ts  |  26 ++---
 qa-core/src/account-api/fixtures/index.ts     |   2 +-
 .../tests/accounts/accounts.spec.ts           |  19 ++-
 qa-core/src/jest/globalSetup.ts               |  42 ++++---
 qa-core/src/jest/globalTeardown.ts            |   4 +-
 .../src/shared/BudibaseTestConfiguration.ts   |   5 +-
 14 files changed, 140 insertions(+), 143 deletions(-)

diff --git a/packages/types/src/api/account/accounts.ts b/packages/types/src/api/account/accounts.ts
index e2accf7c18..bb3419c5d1 100644
--- a/packages/types/src/api/account/accounts.ts
+++ b/packages/types/src/api/account/accounts.ts
@@ -19,4 +19,4 @@ export interface SearchAccountsRequest {
   tenantId?: string
 }
 
-export type SearchAccountsResponse = Account[]
\ No newline at end of file
+export type SearchAccountsResponse = Account[]
diff --git a/qa-core/scripts/createEnv.js b/qa-core/scripts/createEnv.js
index ebb165f3a9..64b9664049 100644
--- a/qa-core/scripts/createEnv.js
+++ b/qa-core/scripts/createEnv.js
@@ -13,7 +13,7 @@ function init() {
       BB_ADMIN_USER_PASSWORD: "admin",
       LOG_LEVEL: "info",
       JEST_TIMEOUT: "60000",
-      DISABLE_PINO_LOGGER: "1"
+      DISABLE_PINO_LOGGER: "1",
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {
diff --git a/qa-core/src/account-api/api/AccountInternalAPIClient.ts b/qa-core/src/account-api/api/AccountInternalAPIClient.ts
index b1e32cac1f..1b73f51320 100644
--- a/qa-core/src/account-api/api/AccountInternalAPIClient.ts
+++ b/qa-core/src/account-api/api/AccountInternalAPIClient.ts
@@ -48,7 +48,7 @@ export default class AccountInternalAPIClient {
       if (options.internal) {
         requestOptions.headers = {
           ...requestOptions.headers,
-          ...{ [Header.API_KEY] : env.ACCOUNT_PORTAL_API_KEY },
+          ...{ [Header.API_KEY]: env.ACCOUNT_PORTAL_API_KEY },
         }
       }
 
diff --git a/qa-core/src/account-api/api/apis/AccountAPI.ts b/qa-core/src/account-api/api/apis/AccountAPI.ts
index 8c6ccec6b8..33e64da7ad 100644
--- a/qa-core/src/account-api/api/apis/AccountAPI.ts
+++ b/qa-core/src/account-api/api/apis/AccountAPI.ts
@@ -1,5 +1,10 @@
 import { Response } from "node-fetch"
-import { Account, CreateAccountRequest, SearchAccountsRequest, SearchAccountsResponse } from "@budibase/types"
+import {
+  Account,
+  CreateAccountRequest,
+  SearchAccountsRequest,
+  SearchAccountsResponse,
+} from "@budibase/types"
 import AccountInternalAPIClient from "../AccountInternalAPIClient"
 import { APIRequestOpts } from "../../../types"
 import { Header } from "@budibase/backend-core"
@@ -13,17 +18,11 @@ export default class AccountAPI extends BaseAPI {
     this.client = client
   }
 
-  async validateEmail(
-    email: string,
-    opts: APIRequestOpts = { status: 200 }
-  ) {
+  async validateEmail(email: string, opts: APIRequestOpts = { status: 200 }) {
     return this.doRequest(() => {
-      return this.client.post(
-        `/api/accounts/validate/email`,
-        {
-          body: { email },
-        }
-      )
+      return this.client.post(`/api/accounts/validate/email`, {
+        body: { email },
+      })
     }, opts)
   }
 
@@ -32,22 +31,22 @@ export default class AccountAPI extends BaseAPI {
     opts: APIRequestOpts = { status: 200 }
   ) {
     return this.doRequest(() => {
-      return this.client.post(
-        `/api/accounts/validate/tenantId`,
-        {
-          body: { tenantId },
-        }
-      )
+      return this.client.post(`/api/accounts/validate/tenantId`, {
+        body: { tenantId },
+      })
     }, opts)
   }
 
   async create(
     body: CreateAccountRequest,
-    opts: APIRequestOpts & { autoVerify: boolean } = { status: 201, autoVerify: false }
+    opts: APIRequestOpts & { autoVerify: boolean } = {
+      status: 201,
+      autoVerify: false,
+    }
   ): Promise<[Response, Account]> {
     return this.doRequest(() => {
       const headers = {
-        "no-verify": opts.autoVerify ? "1" : "0"
+        "no-verify": opts.autoVerify ? "1" : "0",
       }
       return this.client.post(`/api/accounts`, {
         body,
@@ -56,81 +55,63 @@ export default class AccountAPI extends BaseAPI {
     }, opts)
   }
 
-  async delete(
-    accountID: string,
-    opts: APIRequestOpts = { status: 204 }) {
+  async delete(accountID: string, opts: APIRequestOpts = { status: 204 }) {
     return this.doRequest(() => {
-      return this.client.del(
-        `/api/accounts/${accountID}`,
-        {
-          internal: true,
-        }
-      )
+      return this.client.del(`/api/accounts/${accountID}`, {
+        internal: true,
+      })
     }, opts)
   }
 
-  async deleteCurrentAccount(
-    opts: APIRequestOpts = { status: 204 }
-  ) {
+  async deleteCurrentAccount(opts: APIRequestOpts = { status: 204 }) {
     return this.doRequest(() => {
-      return this.client.del(
-        `/api/accounts`
-      )
+      return this.client.del(`/api/accounts`)
     }, opts)
   }
 
   async verifyAccount(
     verificationCode: string,
     opts: APIRequestOpts = { status: 200 }
-  ){
+  ) {
     return this.doRequest(() => {
-      return this.client.post(
-        `/api/accounts/verify`,
-        {
-          body: { verificationCode },
-        }
-      )
+      return this.client.post(`/api/accounts/verify`, {
+        body: { verificationCode },
+      })
     }, opts)
   }
 
   async sendVerificationEmail(
-      email: string,
-      opts: APIRequestOpts = { status: 200 }
+    email: string,
+    opts: APIRequestOpts = { status: 200 }
   ): Promise<[Response, string]> {
     return this.doRequest(async () => {
-      const [response] = await this.client.post(
-        `/api/accounts/verify/send`,
-        {
-          body: { email },
-          headers: {
-            [Header.RETURN_VERIFICATION_CODE]: "1"
-          }
-        }
-      )
+      const [response] = await this.client.post(`/api/accounts/verify/send`, {
+        body: { email },
+        headers: {
+          [Header.RETURN_VERIFICATION_CODE]: "1",
+        },
+      })
       const code = response.headers.get(Header.VERIFICATION_CODE)
       return [response, code]
     }, opts)
   }
 
   async search(
-      searchType: string,
-      search: 'email' | 'tenantId',
-      opts: APIRequestOpts = { status: 200 }
+    searchType: string,
+    search: "email" | "tenantId",
+    opts: APIRequestOpts = { status: 200 }
   ): Promise<[Response, SearchAccountsResponse]> {
     return this.doRequest(() => {
       let body: SearchAccountsRequest = {}
-      if (search === 'email') {
+      if (search === "email") {
         body.email = searchType
-      } else if (search === 'tenantId') {
+      } else if (search === "tenantId") {
         body.tenantId = searchType
       }
-      return this.client.post(
-        `/api/accounts/search`,
-        {
-          body,
-          internal: true
-        }
-      )
+      return this.client.post(`/api/accounts/search`, {
+        body,
+        internal: true,
+      })
     }, opts)
   }
 }
diff --git a/qa-core/src/account-api/api/apis/AuthAPI.ts b/qa-core/src/account-api/api/apis/AuthAPI.ts
index c5d654ade0..50345c891b 100644
--- a/qa-core/src/account-api/api/apis/AuthAPI.ts
+++ b/qa-core/src/account-api/api/apis/AuthAPI.ts
@@ -17,15 +17,12 @@ export default class AuthAPI extends BaseAPI {
     opts: APIRequestOpts = { doExpect: true, status: 200 }
   ): Promise<[Response, string]> {
     return this.doRequest(async () => {
-      const [res] = await this.client.post(
-        `/api/auth/login`,
-        {
-          body: {
-            email: email,
-            password: password,
-          },
-        }
-      )
+      const [res] = await this.client.post(`/api/auth/login`, {
+        body: {
+          email: email,
+          password: password,
+        },
+      })
       const cookie = res.headers.get("set-cookie")
       return [res, cookie]
     }, opts)
diff --git a/qa-core/src/account-api/api/apis/BaseAPI.ts b/qa-core/src/account-api/api/apis/BaseAPI.ts
index db0d921dd6..7b74a2d3f5 100644
--- a/qa-core/src/account-api/api/apis/BaseAPI.ts
+++ b/qa-core/src/account-api/api/apis/BaseAPI.ts
@@ -4,10 +4,10 @@ import { APIRequestOpts } from "../../../types"
 // TODO: Add to LicenseAPI
 
 export default class BaseAPI {
-
   async doRequest(
     request: () => Promise<[Response, any]>,
-    opts: APIRequestOpts): Promise<[Response, any]> {
+    opts: APIRequestOpts
+  ): Promise<[Response, any]> {
     const [response, body] = await request()
 
     // do expect on by default
@@ -19,4 +19,4 @@ export default class BaseAPI {
     }
     return [response, body]
   }
-}
\ No newline at end of file
+}
diff --git a/qa-core/src/account-api/api/apis/LicenseAPI.ts b/qa-core/src/account-api/api/apis/LicenseAPI.ts
index 67e67edcb1..f0398ade95 100644
--- a/qa-core/src/account-api/api/apis/LicenseAPI.ts
+++ b/qa-core/src/account-api/api/apis/LicenseAPI.ts
@@ -18,13 +18,10 @@ export default class LicenseAPI extends BaseAPI {
     opts: APIRequestOpts = { status: 200 }
   ): Promise<[Response, Account]> {
     return this.doRequest(() => {
-      return this.client.put(
-        `/api/accounts/${accountId}/license`,
-        {
-          body,
-          internal: true,
-        }
-      )
+      return this.client.put(`/api/accounts/${accountId}/license`, {
+        body,
+        internal: true,
+      })
     }, opts)
   }
 }
diff --git a/qa-core/src/account-api/config/TestConfiguration.ts b/qa-core/src/account-api/config/TestConfiguration.ts
index 6322be97f0..66adb85ca2 100644
--- a/qa-core/src/account-api/config/TestConfiguration.ts
+++ b/qa-core/src/account-api/config/TestConfiguration.ts
@@ -2,28 +2,28 @@ import { AccountInternalAPI } from "../api"
 import { BudibaseTestConfiguration } from "../../shared"
 
 export default class TestConfiguration<T> extends BudibaseTestConfiguration {
-    // apis
-    api: AccountInternalAPI
+  // apis
+  api: AccountInternalAPI
 
-    context: T
+  context: T
 
-    constructor() {
-        super()
-        this.api = new AccountInternalAPI(this.state)
-        this.context = <T>{}
-    }
+  constructor() {
+    super()
+    this.api = new AccountInternalAPI(this.state)
+    this.context = <T>{}
+  }
 
-    async beforeAll() {
-        await super.beforeAll()
-        await this.setApiKey()
-    }
+  async beforeAll() {
+    await super.beforeAll()
+    await this.setApiKey()
+  }
 
-    async afterAll() {
-        await super.afterAll()
-    }
+  async afterAll() {
+    await super.afterAll()
+  }
 
-    async setApiKey() {
-        const apiKeyResponse = await this.internalApi.self.getApiKey()
-        this.state.apiKey = apiKeyResponse.apiKey
-    }
+  async setApiKey() {
+    const apiKeyResponse = await this.internalApi.self.getApiKey()
+    this.state.apiKey = apiKeyResponse.apiKey
+  }
 }
diff --git a/qa-core/src/account-api/fixtures/accounts.ts b/qa-core/src/account-api/fixtures/accounts.ts
index 6c52cb52b0..62c84f3647 100644
--- a/qa-core/src/account-api/fixtures/accounts.ts
+++ b/qa-core/src/account-api/fixtures/accounts.ts
@@ -3,19 +3,19 @@ import { Hosting, CreateAccountRequest } from "@budibase/types"
 
 // TODO: Refactor me to central location
 export const generateAccount = (): CreateAccountRequest => {
-    const uuid = generator.guid()
+  const uuid = generator.guid()
 
-    const email = `${uuid}@budibase.com`
-    const tenant = `tenant${uuid.replace(/-/g, "")}`
+  const email = `${uuid}@budibase.com`
+  const tenant = `tenant${uuid.replace(/-/g, "")}`
 
-    return {
-        email,
-        hosting: Hosting.CLOUD,
-        name: email,
-        password: uuid,
-        profession: "software_engineer",
-        size: "10+",
-        tenantId: tenant,
-        tenantName: tenant,
-    }
+  return {
+    email,
+    hosting: Hosting.CLOUD,
+    name: email,
+    password: uuid,
+    profession: "software_engineer",
+    size: "10+",
+    tenantId: tenant,
+    tenantName: tenant,
+  }
 }
diff --git a/qa-core/src/account-api/fixtures/index.ts b/qa-core/src/account-api/fixtures/index.ts
index 7d09ee1c2c..952f4a8cc8 100644
--- a/qa-core/src/account-api/fixtures/index.ts
+++ b/qa-core/src/account-api/fixtures/index.ts
@@ -1 +1 @@
-export * as accounts from "./accounts"
\ No newline at end of file
+export * as accounts from "./accounts"
diff --git a/qa-core/src/account-api/tests/accounts/accounts.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.spec.ts
index e1c0dd2c20..e3a4d4eacf 100644
--- a/qa-core/src/account-api/tests/accounts/accounts.spec.ts
+++ b/qa-core/src/account-api/tests/accounts/accounts.spec.ts
@@ -35,7 +35,9 @@ describe("Accounts", () => {
       await config.loginAsAccount(createAccountRequest, { status: 400 })
 
       // Re-send verification email to get access to code
-      const [_, code] = await config.accountsApi.accounts.sendVerificationEmail(email)
+      const [_, code] = await config.accountsApi.accounts.sendVerificationEmail(
+        email
+      )
 
       // Send the verification request
       await config.accountsApi.accounts.verifyAccount(code!)
@@ -56,11 +58,17 @@ describe("Accounts", () => {
       const tenantId = generator.string()
 
       // Empty result
-      const [_, emptyBody] = await config.api.accounts.search(tenantId, "tenantId")
+      const [_, emptyBody] = await config.api.accounts.search(
+        tenantId,
+        "tenantId"
+      )
       expect(emptyBody.length).toBe(0)
 
       // Hit result
-      const [hitRes, hitBody] = await config.api.accounts.search(config.state.tenantId!, "tenantId")
+      const [hitRes, hitBody] = await config.api.accounts.search(
+        config.state.tenantId!,
+        "tenantId"
+      )
       expect(hitBody.length).toBe(1)
       expect(hitBody[0].tenantId).toBe(config.state.tenantId)
     })
@@ -73,7 +81,10 @@ describe("Accounts", () => {
       expect(emptyBody.length).toBe(0)
 
       // Hit result
-      const [hitRes, hitBody] = await config.api.accounts.search(config.state.email!, "email")
+      const [hitRes, hitBody] = await config.api.accounts.search(
+        config.state.email!,
+        "email"
+      )
       expect(hitBody.length).toBe(1)
       expect(hitBody[0].email).toBe(config.state.email)
     })
diff --git a/qa-core/src/jest/globalSetup.ts b/qa-core/src/jest/globalSetup.ts
index 68300cee26..103126d74c 100644
--- a/qa-core/src/jest/globalSetup.ts
+++ b/qa-core/src/jest/globalSetup.ts
@@ -9,7 +9,7 @@ import { APIRequestOpts } from "../types"
 const accountsApi = new AccountInternalAPI({})
 const internalApi = new BudibaseInternalAPI({})
 
-const API_OPTS: APIRequestOpts = { doExpect: false}
+const API_OPTS: APIRequestOpts = { doExpect: false }
 
 // @ts-ignore
 global.qa = {}
@@ -18,8 +18,10 @@ async function createAccount(): Promise<[CreateAccountRequest, Account]> {
   const account = fixtures.accounts.generateAccount()
   await accountsApi.accounts.validateEmail(account.email, API_OPTS)
   await accountsApi.accounts.validateTenantId(account.tenantId, API_OPTS)
-  const [res, newAccount] = await accountsApi.accounts.create(
-      account, {...API_OPTS, autoVerify: true })
+  const [res, newAccount] = await accountsApi.accounts.create(account, {
+    ...API_OPTS,
+    autoVerify: true,
+  })
   await updateLicense(newAccount.accountId)
   return [account, newAccount]
 }
@@ -27,25 +29,29 @@ async function createAccount(): Promise<[CreateAccountRequest, Account]> {
 const UNLIMITED = { value: -1 }
 
 async function updateLicense(accountId: string) {
-  const [response] = await accountsApi.licenses.updateLicense(accountId, {
-    overrides: {
-      // add all features
-      features: Object.values(Feature),
-      quotas: {
-        usage: {
-          monthly: {
-            automations: UNLIMITED,
-          },
-          static: {
-            rows: UNLIMITED,
-            users: UNLIMITED,
-            userGroups: UNLIMITED,
-            plugins: UNLIMITED,
+  const [response] = await accountsApi.licenses.updateLicense(
+    accountId,
+    {
+      overrides: {
+        // add all features
+        features: Object.values(Feature),
+        quotas: {
+          usage: {
+            monthly: {
+              automations: UNLIMITED,
+            },
+            static: {
+              rows: UNLIMITED,
+              users: UNLIMITED,
+              userGroups: UNLIMITED,
+              plugins: UNLIMITED,
+            },
           },
         },
       },
     },
-  }, { doExpect: false })
+    { doExpect: false }
+  )
   if (response.status !== 200) {
     throw new Error(
       `Could not update license for accountId=${accountId}: ${response.status}`
diff --git a/qa-core/src/jest/globalTeardown.ts b/qa-core/src/jest/globalTeardown.ts
index f1b8c1d541..ff3fea7b7c 100644
--- a/qa-core/src/jest/globalTeardown.ts
+++ b/qa-core/src/jest/globalTeardown.ts
@@ -11,7 +11,9 @@ async function deleteAccount() {
   // @ts-ignore
   const accountID = global.qa.accountId
 
-  const [response] = await accountsApi.accounts.delete(accountID, { doExpect: false })
+  const [response] = await accountsApi.accounts.delete(accountID, {
+    doExpect: false,
+  })
   if (response.status !== 204) {
     throw new Error(`status: ${response.status} not equal to expected: 201`)
   }
diff --git a/qa-core/src/shared/BudibaseTestConfiguration.ts b/qa-core/src/shared/BudibaseTestConfiguration.ts
index 9841b8d163..18b7c89ec8 100644
--- a/qa-core/src/shared/BudibaseTestConfiguration.ts
+++ b/qa-core/src/shared/BudibaseTestConfiguration.ts
@@ -69,7 +69,10 @@ export default class BudibaseTestConfiguration {
     this.state.email = original.email
   }
 
-  async loginAsAccount(account: CreateAccountRequest, opts: APIRequestOpts = {}) {
+  async loginAsAccount(
+    account: CreateAccountRequest,
+    opts: APIRequestOpts = {}
+  ) {
     const [_, cookie] = await this.accountsApi.auth.login(
       account.email,
       account.password,

From de3385a7536fe006130b7fc0d2821c4b72e69b4d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 19 Jul 2023 15:40:37 +0000
Subject: [PATCH 19/35] Bump version to 2.8.12-alpha.6

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index a2456706d1..863f04e38b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.12-alpha.5",
+  "version": "2.8.12-alpha.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 979883257ef858986281c9b6123d9051a54def85 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 19 Jul 2023 17:11:15 +0100
Subject: [PATCH 20/35] backmerge master

---
 .github/workflows/release-master.yml          |  2 +-
 .github/workflows/release-selfhost.yml        |  6 +--
 .github/workflows/release-singleimage.yml     |  4 +-
 charts/budibase/values.yaml                   |  2 +-
 lerna.json                                    |  2 +-
 .../SetupPanel/AutomationBlockSetup.svelte    | 46 ++++++++++++++-----
 .../common/CodeEditor/CodeEditor.svelte       | 29 +++++++-----
 packages/client/src/components/Block.svelte   | 19 ++++----
 .../src/components/BlockComponent.svelte      | 10 ++--
 .../components/app/blocks/CardsBlock.svelte   |  2 +-
 .../components/app/blocks/TableBlock.svelte   |  2 +-
 packages/client/src/utils/buttonActions.js    |  2 +-
 scripts/versionCommit.sh                      |  2 +-
 13 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index 9a86f50c04..c0e012bb27 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -98,7 +98,7 @@ jobs:
           git fetch
           mkdir sync
           echo "Packaging chart to sync dir"
-          helm package charts/budibase --version 0.0.0-master --app-version v"$RELEASE_VERSION" --destination sync
+          helm package charts/budibase --version 0.0.0-master --app-version "$RELEASE_VERSION" --destination sync
           echo "Packaging successful"
           git checkout gh-pages
           echo "Indexing helm repo"         
diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml
index f4524e99dc..39ee812726 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -43,7 +43,7 @@ jobs:
         run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
 
-          release_tag=v${{ env.RELEASE_VERSION }}
+          release_tag=${{ env.RELEASE_VERSION }}
 
           # Pull apps and worker images
           docker pull budibase/apps:$release_tag
@@ -108,8 +108,8 @@ jobs:
       - name: Perform Github Release
         uses: softprops/action-gh-release@v1
         with:
-          name: v${{ env.RELEASE_VERSION }}
-          tag_name: v${{ env.RELEASE_VERSION }}
+          name: ${{ env.RELEASE_VERSION }}
+          tag_name: ${{ env.RELEASE_VERSION }}
           generate_release_notes: true
           files: |
             packages/cli/build/cli-win.exe
diff --git a/.github/workflows/release-singleimage.yml b/.github/workflows/release-singleimage.yml
index 5408b48ef8..92f21bd649 100644
--- a/.github/workflows/release-singleimage.yml
+++ b/.github/workflows/release-singleimage.yml
@@ -71,7 +71,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: budibase/budibase,budibase/budibase:v${{ env.RELEASE_VERSION }}
+          tags: budibase/budibase,budibase/budibase:${{ env.RELEASE_VERSION }}
           file: ./hosting/single/Dockerfile
       - name: Tag and release Budibase Azure App Service docker image
         uses: docker/build-push-action@v2
@@ -80,5 +80,5 @@ jobs:
           push: true
           platforms: linux/amd64
           build-args: TARGETBUILD=aas
-          tags: budibase/budibase-aas,budibase/budibase-aas:v${{ env.RELEASE_VERSION }}
+          tags: budibase/budibase-aas,budibase/budibase-aas:${{ env.RELEASE_VERSION }}
           file: ./hosting/single/Dockerfile
diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 2d89e81b7f..74e4c52654 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -209,7 +209,7 @@ services:
 # Override values in couchDB subchart
 couchdb:
   ## clusterSize is the initial size of the CouchDB cluster.
-  clusterSize: 3
+  clusterSize: 1
   allowAdminParty: false
 
   # Secret Management
diff --git a/lerna.json b/lerna.json
index a2456706d1..551b1f60f2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.12-alpha.5",
+  "version": "2.8.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 823dcc432b..cece075860 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -15,6 +15,7 @@
     Icon,
     Checkbox,
     DatePicker,
+    Detail,
   } from "@budibase/bbui"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
   import { automationStore, selectedAutomation } from "builderStore"
@@ -32,7 +33,7 @@
   import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
   import {
     bindingsToCompletions,
-    jsAutocomplete,
+    hbAutocomplete,
     EditorModes,
   } from "components/common/CodeEditor"
   import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte"
@@ -55,6 +56,7 @@
   let drawer
   let fillWidth = true
   let inputData
+  let codeBindingOpen = false
 
   $: filters = lookForFilters(schemaProperties) || []
   $: tempFilters = filters
@@ -70,6 +72,13 @@
   $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000"
   $: isTrigger = block?.type === "TRIGGER"
   $: isUpdateRow = stepId === ActionStepID.UPDATE_ROW
+  $: codeMode =
+    stepId === "EXECUTE_BASH" ? EditorModes.Handlebars : EditorModes.JS
+
+  $: stepCompletions =
+    codeMode === EditorModes.Handlebars
+      ? [hbAutocomplete([...bindingsToCompletions(bindings, codeMode)])]
+      : []
 
   /**
    * TODO - Remove after November 2023
@@ -489,6 +498,18 @@
           />
         {:else if value.customType === "code"}
           <CodeEditorModal>
+            {#if codeMode == EditorModes.JS}
+              <ActionButton
+                on:click={() => (codeBindingOpen = !codeBindingOpen)}
+                quiet
+                icon={codeBindingOpen ? "ChevronDown" : "ChevronRight"}
+              >
+                <Detail size="S">Bindings</Detail>
+              </ActionButton>
+              {#if codeBindingOpen}
+                <pre>{JSON.stringify(bindings, null, 2)}</pre>
+              {/if}
+            {/if}
             <CodeEditor
               value={inputData[key]}
               on:change={e => {
@@ -496,19 +517,22 @@
                 onChange({ detail: e.detail }, key)
                 inputData[key] = e.detail
               }}
-              completions={[
-                jsAutocomplete([
-                  ...bindingsToCompletions(bindings, EditorModes.JS),
-                ]),
-              ]}
-              mode={EditorModes.JS}
+              completions={stepCompletions}
+              mode={codeMode}
+              autocompleteEnabled={codeMode != EditorModes.JS}
               height={500}
             />
             <div class="messaging">
-              <Icon name="FlashOn" />
-              <div class="messaging-wrap">
-                <div>Add available bindings by typing <strong>$</strong></div>
-              </div>
+              {#if codeMode == EditorModes.Handlebars}
+                <Icon name="FlashOn" />
+                <div class="messaging-wrap">
+                  <div>
+                    Add available bindings by typing <strong>
+                      &#125;&#125;
+                    </strong>
+                  </div>
+                </div>
+              {/if}
             </div>
           </CodeEditorModal>
         {:else if value.customType === "loopOption"}
diff --git a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
index e68d3fd842..74f160710f 100644
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@@ -51,6 +51,7 @@
   export let mode = EditorModes.Handlebars
   export let value = ""
   export let placeholder = null
+  export let autocompleteEnabled = true
 
   // Export a function to expose caret position
   export const getCaretPosition = () => {
@@ -150,12 +151,6 @@
       syntaxHighlighting(oneDarkHighlightStyle, { fallback: true }),
       highlightActiveLineGutter(),
       highlightSpecialChars(),
-      autocompletion({
-        override: [...completions],
-        closeOnBlur: true,
-        icons: false,
-        optionClass: () => "autocomplete-option",
-      }),
       EditorView.lineWrapping,
       EditorView.updateListener.of(v => {
         const docStr = v.state.doc?.toString()
@@ -178,11 +173,16 @@
 
   const buildExtensions = base => {
     const complete = [...base]
-    if (mode.name == "javascript") {
-      complete.push(javascript())
-      complete.push(highlightWhitespace())
-      complete.push(lineNumbers())
-      complete.push(foldGutter())
+
+    if (autocompleteEnabled) {
+      complete.push(
+        autocompletion({
+          override: [...completions],
+          closeOnBlur: true,
+          icons: false,
+          optionClass: () => "autocomplete-option",
+        })
+      )
       complete.push(
         EditorView.inputHandler.of((view, from, to, insert) => {
           if (insert === "$") {
@@ -212,6 +212,13 @@
       )
     }
 
+    if (mode.name == "javascript") {
+      complete.push(javascript())
+      complete.push(highlightWhitespace())
+      complete.push(lineNumbers())
+      complete.push(foldGutter())
+    }
+
     if (placeholder) {
       complete.push(placeholderFn(placeholder))
     }
diff --git a/packages/client/src/components/Block.svelte b/packages/client/src/components/Block.svelte
index b72ff81b49..a739065015 100644
--- a/packages/client/src/components/Block.svelte
+++ b/packages/client/src/components/Block.svelte
@@ -8,27 +8,31 @@
 
   let structureLookupMap = {}
 
-  const registerBlockComponent = (id, order, parentId, instance) => {
+  const registerBlockComponent = (id, parentId, order, instance) => {
     // Ensure child map exists
     if (!structureLookupMap[parentId]) {
       structureLookupMap[parentId] = {}
     }
     // Add this instance in this order, overwriting any existing instance in
     // this order in case of repeaters
-    structureLookupMap[parentId][order] = instance
+    structureLookupMap[parentId][id] = { order, instance }
   }
 
-  const unregisterBlockComponent = (order, parentId) => {
+  const unregisterBlockComponent = (id, parentId) => {
     // Ensure child map exists
     if (!structureLookupMap[parentId]) {
       return
     }
-    delete structureLookupMap[parentId][order]
+    delete structureLookupMap[parentId][id]
   }
 
   const eject = () => {
     // Start the new structure with the root component
-    let definition = structureLookupMap[$component.id][0]
+    const rootMap = structureLookupMap[$component.id] || {}
+    let definition = Object.values(rootMap)[0]?.instance
+    if (!definition) {
+      return
+    }
 
     // Copy styles from block to root component
     definition._styles = {
@@ -49,10 +53,7 @@
   const attachChildren = (rootComponent, map) => {
     // Transform map into children array
     let id = rootComponent._id
-    const children = Object.entries(map[id] || {}).map(([order, instance]) => ({
-      order,
-      instance,
-    }))
+    const children = Object.values(map[id] || {})
     if (!children.length) {
       return
     }
diff --git a/packages/client/src/components/BlockComponent.svelte b/packages/client/src/components/BlockComponent.svelte
index 4f720e2931..24d9b4dee4 100644
--- a/packages/client/src/components/BlockComponent.svelte
+++ b/packages/client/src/components/BlockComponent.svelte
@@ -23,6 +23,8 @@
   // Create a fake component instance so that we can use the core Component
   // to render this part of the block, taking advantage of binding enrichment
   $: id = `${block.id}-${context ?? rand}`
+  $: parentId = $component?.id
+  $: inBuilder = $builderStore.inBuilder
   $: instance = {
     _component: `@budibase/standard-components/${type}`,
     _id: id,
@@ -38,14 +40,14 @@
   // Register this block component if we're inside the builder so it can be
   // ejected later
   $: {
-    if ($builderStore.inBuilder) {
-      block.registerComponent(id, order ?? 0, $component?.id, instance)
+    if (inBuilder) {
+      block.registerComponent(id, parentId, order ?? 0, instance)
     }
   }
 
   onDestroy(() => {
-    if ($builderStore.inBuilder) {
-      block.unregisterComponent(order ?? 0, $component?.id)
+    if (inBuilder) {
+      block.unregisterComponent(id, parentId)
     }
   })
 </script>
diff --git a/packages/client/src/components/app/blocks/CardsBlock.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte
index bbe54867ee..3e48247f92 100644
--- a/packages/client/src/components/app/blocks/CardsBlock.svelte
+++ b/packages/client/src/components/app/blocks/CardsBlock.svelte
@@ -126,7 +126,7 @@
             order={1}
           >
             {#if enrichedSearchColumns?.length}
-              {#each enrichedSearchColumns as column, idx}
+              {#each enrichedSearchColumns as column, idx (column.name)}
                 <BlockComponent
                   type={column.componentType}
                   props={{
diff --git a/packages/client/src/components/app/blocks/TableBlock.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte
index 492990ad01..efc83fd5ac 100644
--- a/packages/client/src/components/app/blocks/TableBlock.svelte
+++ b/packages/client/src/components/app/blocks/TableBlock.svelte
@@ -170,7 +170,7 @@
             order={1}
           >
             {#if enrichedSearchColumns?.length}
-              {#each enrichedSearchColumns as column, idx}
+              {#each enrichedSearchColumns as column, idx (column.name)}
                 <BlockComponent
                   type={column.componentType}
                   props={{
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 68f312f0ad..0405dc7d55 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -478,7 +478,7 @@ export const enrichButtonActions = (actions, context) => {
                     actions.slice(i + 1),
                     newContext
                   )
-                  resolve(await next())
+                  resolve(typeof next === "function" ? await next() : true)
                 } else {
                   resolve(false)
                 }
diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh
index 71c931d736..86db0136e7 100755
--- a/scripts/versionCommit.sh
+++ b/scripts/versionCommit.sh
@@ -13,6 +13,6 @@ node ./bumpVersion.js $1
 NEW_VERSION=$(node -p "require('../lerna.json').version")
 git add ../lerna.json
 git commit -m "Bump version to $NEW_VERSION"
-git tag v$NEW_VERSION
+git tag $NEW_VERSION
 git push
 git push --tags
\ No newline at end of file

From 6631c2644d3c1840bdb838faab567d4698353dc8 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 19 Jul 2023 17:18:37 +0100
Subject: [PATCH 21/35] Fixing merge issue

---
 packages/backend-core/src/logging/index.ts       | 3 ---
 packages/backend-core/src/logging/pino/logger.ts | 2 --
 qa-core/src/jest/jestSetup.ts                    | 8 +++-----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/backend-core/src/logging/index.ts b/packages/backend-core/src/logging/index.ts
index f7e1c4fa41..0824fa681b 100644
--- a/packages/backend-core/src/logging/index.ts
+++ b/packages/backend-core/src/logging/index.ts
@@ -2,6 +2,3 @@ export * as correlation from "./correlation/correlation"
 export { logger } from "./pino/logger"
 export * from "./alerts"
 export * as system from "./system"
-
-// turn off or on context logging i.e. tenantId, appId etc
-export let LOG_CONTEXT = true
diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts
index 73b91d2fde..f2024db72b 100644
--- a/packages/backend-core/src/logging/pino/logger.ts
+++ b/packages/backend-core/src/logging/pino/logger.ts
@@ -2,11 +2,9 @@ import pino, { LoggerOptions } from "pino"
 import pinoPretty from "pino-pretty"
 
 import { IdentityType } from "@budibase/types"
-
 import env from "../../environment"
 import * as context from "../../context"
 import * as correlation from "../correlation"
-import { LOG_CONTEXT } from "../index"
 
 import { localFileDestination } from "../system"
 
diff --git a/qa-core/src/jest/jestSetup.ts b/qa-core/src/jest/jestSetup.ts
index 6c60845c87..f89d71dfcb 100644
--- a/qa-core/src/jest/jestSetup.ts
+++ b/qa-core/src/jest/jestSetup.ts
@@ -1,5 +1,3 @@
-import { logging } from "@budibase/backend-core"
-logging.LOG_CONTEXT = false
-
-jest.retryTimes(2)
-jest.setTimeout(60000)
+const envTimeout = process.env.JEST_TIMEOUT
+const timeout = envTimeout && parseInt(envTimeout)
+jest.setTimeout(timeout || 60000)
\ No newline at end of file

From 9ecce2c5dc6e772501a68e4b325a692e8183d318 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 19 Jul 2023 16:28:22 +0000
Subject: [PATCH 22/35] Bump version to 2.8.16-alpha.0

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 551b1f60f2..498d8a91b5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.15",
+  "version": "2.8.16-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From f9b54d6de493e3abcef75b474a4afcb5494d255d Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 19 Jul 2023 17:30:16 +0100
Subject: [PATCH 23/35] Update test commands to use dedicated environments: ci
 / prod / qa

---
 .github/workflows/budibase_ci.yml | 2 +-
 qa-core/package.json              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index b644a6bdb9..86e7df66da 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -159,7 +159,7 @@ jobs:
         run: |
           cd qa-core
           yarn setup
-          yarn test:ci
+          yarn serve:test:ci
         env:
           BB_ADMIN_USER_EMAIL: admin
           BB_ADMIN_USER_PASSWORD: admin
diff --git a/qa-core/package.json b/qa-core/package.json
index 555b277742..1fbd0c0254 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -15,8 +15,10 @@
     "test:watch": "yarn run test --watch",
     "test:debug": "DEBUG=1 yarn run test",
     "test:notify": "node scripts/testResultsWebhook",
-    "test:smoke": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts",
-    "test:ci": "start-server-and-test dev:built http://localhost:4001/health test:smoke",
+    "test:cloud:prod": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts",
+    "test:cloud:qa": "yarn run test",
+    "test:ci": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts /account-api/",
+    "serve:test:ci": "start-server-and-test dev:built http://localhost:4001/health test:smoke",
     "serve": "start-server-and-test dev:built http://localhost:4001/health",
     "dev:built": "cd ../ && yarn dev:built"
   },

From ec5203f775f8820a172a846b981faf38f316b681 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 19 Jul 2023 17:31:33 +0100
Subject: [PATCH 24/35] PR changes

---
 packages/worker/src/api/controllers/global/auth.ts | 2 --
 qa-core/src/account-api/api/apis/BaseAPI.ts        | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index a458a98aa7..131601c6ad 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -53,8 +53,6 @@ async function passportCallback(
 }
 
 export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
-  const tenantId = context.getTenantId()
-  console.log(tenantId)
   const email = ctx.request.body.username
 
   const user = await userSdk.getUserByEmail(email)
diff --git a/qa-core/src/account-api/api/apis/BaseAPI.ts b/qa-core/src/account-api/api/apis/BaseAPI.ts
index 7b74a2d3f5..ed5d261e9e 100644
--- a/qa-core/src/account-api/api/apis/BaseAPI.ts
+++ b/qa-core/src/account-api/api/apis/BaseAPI.ts
@@ -1,8 +1,6 @@
 import { Response } from "node-fetch"
 import { APIRequestOpts } from "../../../types"
 
-// TODO: Add to LicenseAPI
-
 export default class BaseAPI {
   async doRequest(
     request: () => Promise<[Response, any]>,

From 8f2d8a7b642460dcb1c9081784c08960782a2c84 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jul 2023 09:21:38 +0100
Subject: [PATCH 25/35] Update test commands to ignore cloud specific tests in
 CI

---
 qa-core/package.json                                        | 6 +++---
 ...nts.internal.spec.ts => accounts.cloud.internal.spec.ts} | 0
 .../accounts/{accounts.spec.ts => accounts.cloud.spec.ts}   | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename qa-core/src/account-api/tests/accounts/{accounts.internal.spec.ts => accounts.cloud.internal.spec.ts} (100%)
 rename qa-core/src/account-api/tests/accounts/{accounts.spec.ts => accounts.cloud.spec.ts} (100%)

diff --git a/qa-core/package.json b/qa-core/package.json
index 1fbd0c0254..710e0b6a3b 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -15,10 +15,10 @@
     "test:watch": "yarn run test --watch",
     "test:debug": "DEBUG=1 yarn run test",
     "test:notify": "node scripts/testResultsWebhook",
-    "test:cloud:prod": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts",
+    "test:cloud:prod": "yarn run test --testPathIgnorePatterns=\\.integration\\.",
     "test:cloud:qa": "yarn run test",
-    "test:ci": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts /account-api/",
-    "serve:test:ci": "start-server-and-test dev:built http://localhost:4001/health test:smoke",
+    "test:self:ci": "yarn run test --testPathIgnorePatterns=\\.integration\\. \\.cloud\\.",
+    "serve:test:self:ci": "start-server-and-test dev:built http://localhost:4001/health test:self:ci",
     "serve": "start-server-and-test dev:built http://localhost:4001/health",
     "dev:built": "cd ../ && yarn dev:built"
   },
diff --git a/qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.cloud.internal.spec.ts
similarity index 100%
rename from qa-core/src/account-api/tests/accounts/accounts.internal.spec.ts
rename to qa-core/src/account-api/tests/accounts/accounts.cloud.internal.spec.ts
diff --git a/qa-core/src/account-api/tests/accounts/accounts.spec.ts b/qa-core/src/account-api/tests/accounts/accounts.cloud.spec.ts
similarity index 100%
rename from qa-core/src/account-api/tests/accounts/accounts.spec.ts
rename to qa-core/src/account-api/tests/accounts/accounts.cloud.spec.ts

From e2a792797368f249cd7df806bf00c43c6ad9a2b4 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jul 2023 10:52:28 +0100
Subject: [PATCH 26/35] Lint + update ci test command

---
 .github/workflows/budibase_ci.yml | 2 +-
 qa-core/src/jest/jestSetup.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 86e7df66da..9509a22e99 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -159,7 +159,7 @@ jobs:
         run: |
           cd qa-core
           yarn setup
-          yarn serve:test:ci
+          yarn serve:test:self:ci
         env:
           BB_ADMIN_USER_EMAIL: admin
           BB_ADMIN_USER_PASSWORD: admin
diff --git a/qa-core/src/jest/jestSetup.ts b/qa-core/src/jest/jestSetup.ts
index f89d71dfcb..928e547337 100644
--- a/qa-core/src/jest/jestSetup.ts
+++ b/qa-core/src/jest/jestSetup.ts
@@ -1,3 +1,3 @@
 const envTimeout = process.env.JEST_TIMEOUT
 const timeout = envTimeout && parseInt(envTimeout)
-jest.setTimeout(timeout || 60000)
\ No newline at end of file
+jest.setTimeout(timeout || 60000)

From ebc5caf6590892df5bd3114ca120dff1e44548e2 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jul 2023 10:54:36 +0100
Subject: [PATCH 27/35] Fix develop reference

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 9c564edb37..4d9840700e 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 9c564edb37cb619cb5971e10c4317fa6e7c5bb00
+Subproject commit 4d9840700e7684581c39965b7cb6a2b2428c477c

From b60794d73ad0dff989432bf3da4aff551555350a Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jul 2023 11:13:57 +0100
Subject: [PATCH 28/35] Update pro reference to latest develop and fix compile
 errors

---
 packages/pro                                       | 2 +-
 packages/server/src/api/controllers/query/index.ts | 4 ++--
 packages/server/src/api/controllers/row/index.ts   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/pro b/packages/pro
index 9c564edb37..4d9840700e 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 9c564edb37cb619cb5971e10c4317fa6e7c5bb00
+Subproject commit 4d9840700e7684581c39965b7cb6a2b2428c477c
diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts
index 4c1cad6b5b..466fe90e07 100644
--- a/packages/server/src/api/controllers/query/index.ts
+++ b/packages/server/src/api/controllers/query/index.ts
@@ -157,7 +157,7 @@ export async function preview(ctx: any) {
     }
     const runFn = () => Runner.run(inputs)
 
-    const { rows, keys, info, extra } = await quotas.addQuery(runFn, {
+    const { rows, keys, info, extra } = await quotas.addQuery<any>(runFn, {
       datasourceId: datasource._id,
     })
     const schemaFields: any = {}
@@ -246,7 +246,7 @@ async function execute(
     }
     const runFn = () => Runner.run(inputs)
 
-    const { rows, pagination, extra, info } = await quotas.addQuery(runFn, {
+    const { rows, pagination, extra, info } = await quotas.addQuery<any>(runFn, {
       datasourceId: datasource._id,
     })
     // remove the raw from execution incase transformer being used to hide data
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 673f2adb53..aa3aa3e21c 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -25,7 +25,7 @@ export async function patch(ctx: any): Promise<any> {
     return save(ctx)
   }
   try {
-    const { row, table } = await quotas.addQuery(
+    const { row, table } = await quotas.addQuery<any>(
       () => pickApi(tableId).patch(ctx),
       {
         datasourceId: tableId,
@@ -104,7 +104,7 @@ export async function destroy(ctx: any) {
   const tableId = utils.getTableId(ctx)
   let response, row
   if (inputs.rows) {
-    let { rows } = await quotas.addQuery(
+    let { rows } = await quotas.addQuery<any>(
       () => pickApi(tableId).bulkDestroy(ctx),
       {
         datasourceId: tableId,
@@ -117,7 +117,7 @@ export async function destroy(ctx: any) {
       gridSocket?.emitRowDeletion(ctx, row._id)
     }
   } else {
-    let resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
+    let resp = await quotas.addQuery<any>(() => pickApi(tableId).destroy(ctx), {
       datasourceId: tableId,
     })
     await quotas.removeRow()

From 76f61cfd3a983d3513c010bd6572fbb879abb07d Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jul 2023 11:21:34 +0100
Subject: [PATCH 29/35] Lint

---
 packages/server/src/api/controllers/query/index.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts
index 466fe90e07..11ad25f037 100644
--- a/packages/server/src/api/controllers/query/index.ts
+++ b/packages/server/src/api/controllers/query/index.ts
@@ -246,9 +246,12 @@ async function execute(
     }
     const runFn = () => Runner.run(inputs)
 
-    const { rows, pagination, extra, info } = await quotas.addQuery<any>(runFn, {
-      datasourceId: datasource._id,
-    })
+    const { rows, pagination, extra, info } = await quotas.addQuery<any>(
+      runFn,
+      {
+        datasourceId: datasource._id,
+      }
+    )
     // remove the raw from execution incase transformer being used to hide data
     if (extra?.raw) {
       delete extra.raw

From 2141a8ef297ee5d880d6b1b791d822b3f0edbf77 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 20 Jul 2023 10:23:04 +0000
Subject: [PATCH 30/35] Bump version to 2.8.16-alpha.1

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 498d8a91b5..4f2eab4463 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.16-alpha.0",
+  "version": "2.8.16-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 2f5e7d35be9c181a7180f1a3c62119dbdac57759 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 20 Jul 2023 10:54:26 +0000
Subject: [PATCH 31/35] Bump version to 2.8.16-alpha.2

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 4f2eab4463..6c4c087642 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.16-alpha.1",
+  "version": "2.8.16-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From bf5d72d7e36ec49741775063edf25033cda5d8c0 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jul 2023 12:05:04 +0100
Subject: [PATCH 32/35] Fix release and prerelease tag triggers

---
 .github/workflows/release-develop.yml | 2 +-
 .github/workflows/release-master.yml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index a7bf041eb5..e8d88fa136 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -6,7 +6,7 @@ concurrency:
 on:
   push:
     tags:
-      - v*-alpha.*
+      - ".*-alpha.*"
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index c0e012bb27..7f8b8f1d55 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -6,9 +6,9 @@ concurrency:
 on:
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+"
       # Exclude all pre-releases
-      - "!v*[0-9]+.[0-9]+.[0-9]+-*"
+      - "!*[0-9]+.[0-9]+.[0-9]+-*"
 
 env:
   # Posthog token used by ui at build time

From 8e0674e77f038d8dda2aa0035af3a293e5bc81e4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 20 Jul 2023 11:09:31 +0000
Subject: [PATCH 33/35] Bump version to 2.8.16-alpha.3

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 6c4c087642..070a50bdac 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.16-alpha.2",
+  "version": "2.8.16-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 829c3e38bd146f0c112f6db5ea20f77a29a921bf Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jul 2023 12:18:00 +0100
Subject: [PATCH 34/35] Adjust tag regex for prerelease

---
 .github/workflows/release-develop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index e8d88fa136..61cb283e28 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -6,7 +6,7 @@ concurrency:
 on:
   push:
     tags:
-      - ".*-alpha.*"
+      - "*-alpha.*"
   workflow_dispatch:
 
 env:

From 5bf4ae3967c68e0ac336210a14d13a050a1d94aa Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 20 Jul 2023 11:20:22 +0000
Subject: [PATCH 35/35] Bump version to 2.8.16-alpha.4

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 070a50bdac..f9c639e296 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.16-alpha.3",
+  "version": "2.8.16-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"