@budibase/server 2.3.17-alpha.1 → 2.3.17

package/src/api/routes/tests/datasource.spec.ts

@@ -5,10 +5,6 @@ import { checkCacheForDynamicVariable } from "../../../threads/utils"
 import { context, events } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 
-import tk from "timekeeper"
-import { mocks } from "@budibase/backend-core/tests"
-tk.freeze(mocks.date.MOCK_DATE)
-
 let { basicDatasource } = setup.structures
 const pg = require("pg")
 
@@ -19,13 +15,11 @@ describe("/datasources", () => {
 
   afterAll(setup.afterAll)
 
-  async function setupTest() {
+  beforeEach(async () => {
     await config.init()
     datasource = await config.createDatasource()
     jest.clearAllMocks()
-  }
-
-  beforeAll(setupTest)
+  })
 
   describe("create", () => {
     it("should create a new datasource", async () => {
@@ -62,14 +56,7 @@ describe("/datasources", () => {
         datasource: any,
         fields: { path: string; queryString: string }
       ) {
-        return config.previewQuery(
-          request,
-          config,
-          datasource,
-          fields,
-          undefined,
-          ""
-        )
+        return config.previewQuery(request, config, datasource, fields)
       }
 
       it("should invalidate changed or removed variables", async () => {
@@ -104,8 +91,6 @@ describe("/datasources", () => {
   })
 
   describe("fetch", () => {
-    beforeAll(setupTest)
-
     it("returns all the datasources from the server", async () => {
       const res = await request
         .get(`/api/datasources`)
@@ -174,8 +159,6 @@ describe("/datasources", () => {
   })
 
   describe("destroy", () => {
-    beforeAll(setupTest)
-
     it("deletes queries for the datasource after deletion and returns a success message", async () => {
       await config.createQuery()
 

package/src/api/routes/tests/dev.spec.js

@@ -8,7 +8,7 @@ describe("/dev", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     jest.clearAllMocks()
   })

package/src/api/routes/tests/integration.spec.js

@@ -7,7 +7,7 @@ describe("/integrations", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

package/src/api/routes/tests/layout.spec.js

@@ -10,7 +10,7 @@ describe("/layouts", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     layout = await config.createLayout()
     jest.clearAllMocks()

package/src/api/routes/tests/metadata.spec.js

@@ -9,7 +9,7 @@ describe("/metadata", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     automation = await config.createAutomation()
   })

package/src/api/routes/tests/misc.spec.js

@@ -7,7 +7,7 @@ describe("run misc tests", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

package/src/api/routes/tests/permissions.spec.js

@@ -15,11 +15,8 @@ describe("/permission", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
-    await config.init()
-  })
-  
   beforeEach(async () => {
+    await config.init()
     table = await config.createTable()
     row = await config.createRow()
     perms = await config.addPermission(STD_ROLE_ID, table._id)

package/src/api/routes/tests/{query.seq.spec.js → query.spec.js}

@@ -1,6 +1,3 @@
-const tk = require( "timekeeper")
-tk.freeze(Date.now())
-
 // Mock out postgres for this
 jest.mock("pg")
 jest.mock("node-fetch")
@@ -30,15 +27,10 @@ describe("/queries", () => {
 
   afterAll(setup.afterAll)
 
-  const setupTest = async()=>{
-
+  beforeEach(async () => {
     await config.init()
     datasource = await config.createDatasource()
     query = await config.createQuery()
-  }
-
-  beforeAll(async () => {
-    await setupTest()
   })
 
   async function createInvalidIntegration() {
@@ -109,10 +101,6 @@ describe("/queries", () => {
   })
 
   describe("fetch", () => {
-    beforeEach(async() => {
-      await setupTest()
-    })
-
     it("returns all the queries from the server", async () => {
       const res = await request
         .get(`/api/queries`)
@@ -190,10 +178,6 @@ describe("/queries", () => {
   })
 
   describe("destroy", () => {
-    beforeEach(async() => {
-      await setupTest()
-    })
-
     it("deletes a query and returns a success message", async () => {
       await request
         .delete(`/api/queries/${query._id}/${query._rev}`)
@@ -242,7 +226,6 @@ describe("/queries", () => {
       })
       expect(res.body.rows.length).toEqual(1)
       expect(events.query.previewed).toBeCalledTimes(1)
-      delete datasource.config
       expect(events.query.previewed).toBeCalledWith(datasource, query)
     })
 
@@ -256,10 +239,6 @@ describe("/queries", () => {
   })
 
   describe("execute", () => {
-    beforeEach(async() => {
-      await setupTest()
-    })
-
     it("should be able to execute the query", async () => {
       const res = await request
         .post(`/api/queries/${query._id}`)

package/src/api/routes/tests/role.spec.js

@@ -10,7 +10,7 @@ describe("/roles", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 
@@ -60,11 +60,6 @@ describe("/roles", () => {
   })
 
   describe("fetch", () => {
-    beforeAll(async () => {
-      // Recreate the app
-      await config.init()
-    })
-
     it("should list custom roles, plus 2 default roles", async () => {
       const customRole = await config.createRole()
 

package/src/api/routes/tests/routing.spec.js

@@ -16,7 +16,7 @@ describe("/routing", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     screen = basicScreen()
     screen.routing.route = route

package/src/api/routes/tests/row.spec.js

@@ -1,8 +1,3 @@
-const tk = require( "timekeeper")
-const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString()
-tk.freeze(timestamp)
-
-
 const { outputProcessing } = require("../../../utilities/rowProcessor")
 const setup = require("./utilities")
 const { basicRow } = setup.structures
@@ -25,11 +20,8 @@ describe("/rows", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
-  })
-
-  beforeEach(async()=>{
     table = await config.createTable()
     row = basicRow(table._id)
   })
@@ -119,8 +111,8 @@ describe("/rows", () => {
         _id: existing._id,
         _rev: existing._rev,
         type: "row",
-        createdAt: timestamp,
-        updatedAt: timestamp,
+        createdAt: "2020-01-01T00:00:00.000Z",
+        updatedAt: "2020-01-01T00:00:00.000Z",
       })
       await assertQueryUsage(queryUsage + 1)
     })

package/src/api/routes/tests/screen.spec.js

@@ -10,7 +10,7 @@ describe("/screens", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     screen = await config.createScreen()
   })

package/src/api/routes/tests/static.spec.js

@@ -8,8 +8,7 @@ describe("/static", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
-    config.modeSelf()
+  beforeEach(async () => {
     app = await config.init()
   })
 

package/src/api/routes/tests/table.spec.js

@@ -10,7 +10,7 @@ describe("/tables", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     const app = await config.init()
     appId = app.appId
   })

package/src/api/routes/tests/templates.spec.js

@@ -6,7 +6,7 @@ describe("/templates", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

package/src/api/routes/tests/user.spec.js

@@ -1,10 +1,8 @@
-const { roles, utils } = require("@budibase/backend-core")
+const { roles } = require("@budibase/backend-core")
 const { checkPermissionsEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
 const { BUILTIN_ROLE_IDS } = roles
 
-jest.setTimeout(30000)
-
 jest.mock("../../../utilities/workerRequests", () => ({
   getGlobalUsers: jest.fn(() => {
     return {}
@@ -21,15 +19,14 @@ describe("/users", () => {
 
   afterAll(setup.afterAll)
 
-  // For some reason this cannot be a beforeAll or the test "should be able to update the user" fail
   beforeEach(async () => {
     await config.init()
   })
 
   describe("fetch", () => {
     it("returns a list of users from an instance db", async () => {
-      await config.createUser({ id: "uuidx" })
-      await config.createUser({ id: "uuidy" })
+      await config.createUser("uuidx")
+      await config.createUser("uuidy")
       const res = await request
         .get(`/api/users/metadata`)
         .set(config.defaultHeaders())
@@ -56,7 +53,7 @@ describe("/users", () => {
 
   describe("update", () => {
     it("should be able to update the user", async () => {
-      const user = await config.createUser({ id: `us_update${Math.random()}` })
+      const user = await config.createUser()
       user.roleId = BUILTIN_ROLE_IDS.BASIC
       const res = await request
         .put(`/api/users/metadata`)
@@ -180,11 +177,14 @@ describe("/users", () => {
       const app1 = await config.createApp('App 1')
       const app2 = await config.createApp('App 2')
 
-      let user = await config.createUser({
-        builder: false,
-        admin: true,
-      roles: { [app1.appId]: 'ADMIN' }
-    })
+      let user = await config.createUser(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        false,
+        true,
+        { [app1.appId]: 'ADMIN' })
       let res = await request
         .post(`/api/users/metadata/sync/${user._id}`)
         .set(config.defaultHeaders())

package/src/api/routes/tests/utilities/TestFunctions.ts

@@ -4,8 +4,6 @@ import { AppStatus } from "../../../../db/utils"
 import { roles, tenancy, context } from "@budibase/backend-core"
 import { TENANT_ID } from "../../../../tests/utilities/structures"
 import env from "../../../../environment"
-import { db } from "@budibase/backend-core"
-import Nano from "@budibase/nano"
 
 class Request {
   appId: any
@@ -32,10 +30,7 @@ export const getAllTableRows = async (config: any) => {
   return req.body
 }
 
-export const clearAllApps = async (
-  tenantId = TENANT_ID,
-  exceptions: Array<string> = []
-) => {
+export const clearAllApps = async (tenantId = TENANT_ID) => {
   await tenancy.doInTenant(tenantId, async () => {
     const req: any = { query: { status: AppStatus.DEV }, user: { tenantId } }
     await appController.fetch(req)
@@ -43,7 +38,7 @@ export const clearAllApps = async (
     if (!apps || apps.length <= 0) {
       return
     }
-    for (let app of apps.filter((x: any) => !exceptions.includes(x.appId))) {
+    for (let app of apps) {
       const { appId } = app
       const req = new Request(null, { appId })
       await runRequest(appId, appController.destroy, req)
@@ -60,24 +55,6 @@ export const clearAllAutomations = async (config: any) => {
   }
 }
 
-export const wipeDb = async () => {
-  const couchInfo = db.getCouchInfo()
-  const nano = Nano({
-    url: couchInfo.url,
-    requestDefaults: {
-      headers: {
-        Authorization: couchInfo.cookie,
-      },
-    },
-    parseUrl: false,
-  })
-  let dbs
-  do {
-    dbs = await nano.db.list()
-    await Promise.all(dbs.map(x => nano.db.destroy(x)))
-  } while (dbs.length)
-}
-
 export const createRequest = (
   request: any,
   method: any,

package/src/api/routes/tests/utilities/index.ts

@@ -1,6 +1,5 @@
 import TestConfig from "../../../../tests/utilities/TestConfiguration"
 import env from "../../../../environment"
-import supertest from "supertest"
 export * as structures from "../../../../tests/utilities/structures"
 
 function user() {
@@ -45,8 +44,7 @@ export function delay(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
-let request: supertest.SuperTest<supertest.Test> | undefined | null,
-  config: TestConfig | null
+let request: any, config: any
 
 export function beforeAll() {
   config = new TestConfig()
@@ -67,14 +65,14 @@ export function getRequest() {
   if (!request) {
     beforeAll()
   }
-  return request!
+  return request
 }
 
 export function getConfig() {
   if (!config) {
     beforeAll()
   }
-  return config!
+  return config
 }
 
 export async function switchToSelfHosted(func: any) {

package/src/api/routes/tests/view.spec.js

@@ -28,11 +28,8 @@ describe("/views", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
-  })
-  
-  beforeEach(async() => {
     table = await config.createTable(priceTable())
   })
 

package/src/api/routes/tests/webhook.spec.js

@@ -9,8 +9,7 @@ describe("/webhooks", () => {
 
   afterAll(setup.afterAll)
 
-  const setupTest = async () => {
-    config.modeSelf()
+  beforeEach(async () => {
     await config.init()
     const autoConfig = basicAutomation()
     autoConfig.definition.trigger = {
@@ -19,9 +18,7 @@ describe("/webhooks", () => {
     }
     await config.createAutomation(autoConfig)
     webhook = await config.createWebhook()
-  }
-
-  beforeAll(setupTest)
+  })
 
   describe("create", () => {
     it("should create a webhook successfully", async () => {
@@ -47,8 +44,6 @@ describe("/webhooks", () => {
   })
 
   describe("fetch", () => {
-    beforeAll(setupTest)
-
     it("returns the correct routing for basic user", async () => {
       const res = await request
         .get(`/api/webhooks`)
@@ -69,8 +64,6 @@ describe("/webhooks", () => {
   })
 
   describe("delete", () => {
-    beforeAll(setupTest)
-    
     it("should successfully delete", async () => {
       const res = await request
         .delete(`/api/webhooks/${webhook._id}/${webhook._rev}`)
@@ -91,8 +84,6 @@ describe("/webhooks", () => {
   })
 
   describe("build schema", () => {
-    beforeAll(setupTest)
-
     it("should allow building a schema", async () => {
       const res = await request
         .post(`/api/webhooks/schema/${config.getAppId()}/${webhook._id}`)

package/src/app.ts

@@ -1,11 +1,3 @@
-if (process.env.DD_APM_ENABLED) {
-  require("./ddApm")
-}
-
-if (process.env.ELASTIC_APM_ENABLED) {
-  require("./elasticApm")
-}
-
 // need to load environment first
 import env from "./environment"
 
@@ -74,7 +66,6 @@ initialiseWebsockets(server)
 
 let shuttingDown = false,
   errCode = 0
-
 server.on("close", async () => {
   // already in process
   if (shuttingDown) {
@@ -84,7 +75,7 @@ server.on("close", async () => {
   console.log("Server Closed")
   await automations.shutdown()
   await redis.shutdown()
-  events.shutdown()
+  await events.shutdown()
   await Thread.shutdown()
   api.shutdown()
   if (!env.isTest()) {

package/src/automations/steps/discord.ts

@@ -67,17 +67,33 @@ export async function run({ inputs }: AutomationStepInput) {
   if (!avatar_url) {
     avatar_url = DEFAULT_AVATAR_URL
   }
-  const response = await fetch(url, {
-    method: "post",
-    body: JSON.stringify({
-      username,
-      avatar_url,
-      content,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
+  if (!url?.trim()?.length) {
+    return {
+      httpStatus: 400,
+      response: "Missing Webhook URL",
+      success: false,
+    }
+  }
+  let response
+  try {
+    response = await fetch(url, {
+      method: "post",
+      body: JSON.stringify({
+        username,
+        avatar_url,
+        content,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+  } catch (err: any) {
+    return {
+      httpStatus: 400,
+      response: err.message,
+      success: false,
+    }
+  }
 
   const { status, message } = await getFetchResponse(response)
   return {

package/src/automations/steps/integromat.ts

@@ -69,19 +69,35 @@ export const definition: AutomationStepSchema = {
 export async function run({ inputs }: AutomationStepInput) {
   const { url, value1, value2, value3, value4, value5 } = inputs
 
-  const response = await fetch(url, {
-    method: "post",
-    body: JSON.stringify({
-      value1,
-      value2,
-      value3,
-      value4,
-      value5,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
+  if (!url?.trim()?.length) {
+    return {
+      httpStatus: 400,
+      response: "Missing Webhook URL",
+      success: false,
+    }
+  }
+  let response
+  try {
+    response = await fetch(url, {
+      method: "post",
+      body: JSON.stringify({
+        value1,
+        value2,
+        value3,
+        value4,
+        value5,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+  } catch (err: any) {
+    return {
+      httpStatus: 400,
+      response: err.message,
+      success: false,
+    }
+  }
 
   const { status, message } = await getFetchResponse(response)
   return {

package/src/automations/steps/slack.ts

@@ -50,15 +50,31 @@ export const definition: AutomationStepSchema = {
 
 export async function run({ inputs }: AutomationStepInput) {
   let { url, text } = inputs
-  const response = await fetch(url, {
-    method: "post",
-    body: JSON.stringify({
-      text,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
+  if (!url?.trim()?.length) {
+    return {
+      httpStatus: 400,
+      response: "Missing Webhook URL",
+      success: false,
+    }
+  }
+  let response
+  try {
+    response = await fetch(url, {
+      method: "post",
+      body: JSON.stringify({
+        text,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+  } catch (err: any) {
+    return {
+      httpStatus: 400,
+      response: err.message,
+      success: false,
+    }
+  }
 
   const { status, message } = await getFetchResponse(response)
   return {