@budibase/server 2.3.18-alpha.9 → 2.3.18

package/src/tests/utilities/TestConfiguration.ts

@@ -1,4 +1,4 @@
-import { generator, mocks, structures } from "@budibase/backend-core/tests"
+import { mocks } from "@budibase/backend-core/tests"
 
 // init the licensing mock
 import * as pro from "@budibase/pro"
@@ -10,7 +10,6 @@ mocks.licenses.useUnlimited()
 import { init as dbInit } from "../../db"
 dbInit()
 import env from "../../environment"
-import { env as coreEnv } from "@budibase/backend-core"
 import {
   basicTable,
   basicRow,
@@ -39,27 +38,17 @@ import { cleanup } from "../../utilities/fileSystem"
 import newid from "../../db/newid"
 import { generateUserMetadataID } from "../../db/utils"
 import { startup } from "../../startup"
-import supertest from "supertest"
-import {
-  AuthToken,
-  Database,
-  Datasource,
-  Row,
-  SourceName,
-  Table,
-} from "@budibase/types"
-
-type DefaultUserValues = {
-  globalUserId: string
-  email: string
-  firstName: string
-  lastName: string
-  csrfToken: string
-}
+const supertest = require("supertest")
+
+const GLOBAL_USER_ID = "us_uuid1"
+const EMAIL = "babs@babs.com"
+const FIRSTNAME = "Barbara"
+const LASTNAME = "Barbington"
+const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 class TestConfiguration {
   server: any
-  request: supertest.SuperTest<supertest.Test> | undefined
+  request: any
   started: boolean
   appId: string | null
   allApps: any[]
@@ -73,8 +62,6 @@ class TestConfiguration {
   linkedTable: any
   automation: any
   datasource: any
-  tenantId: string | null
-  defaultUserValues: DefaultUserValues
 
   constructor(openServer = true) {
     if (openServer) {
@@ -89,18 +76,6 @@ class TestConfiguration {
     }
     this.appId = null
     this.allApps = []
-    this.tenantId = null
-    this.defaultUserValues = this.populateDefaultUserValues()
-  }
-
-  populateDefaultUserValues(): DefaultUserValues {
-    return {
-      globalUserId: `us_${newid()}`,
-      email: generator.email(),
-      firstName: generator.first(),
-      lastName: generator.last(),
-      csrfToken: generator.hash(),
-    }
   }
 
   getRequest() {
@@ -125,10 +100,10 @@ class TestConfiguration {
 
   getUserDetails() {
     return {
-      globalId: this.defaultUserValues.globalUserId,
-      email: this.defaultUserValues.email,
-      firstName: this.defaultUserValues.firstName,
-      lastName: this.defaultUserValues.lastName,
+      globalId: GLOBAL_USER_ID,
+      email: EMAIL,
+      firstName: FIRSTNAME,
+      lastName: LASTNAME,
     }
   }
 
@@ -136,9 +111,7 @@ class TestConfiguration {
     if (!appId) {
       appId = this.appId
     }
-
-    const tenant = this.getTenantId()
-    return tenancy.doInTenant(tenant, () => {
+    return tenancy.doInTenant(TENANT_ID, () => {
       // check if already in a context
       if (context.getAppId() == null && appId !== null) {
         return context.doInAppContext(appId, async () => {
@@ -154,11 +127,6 @@ class TestConfiguration {
 
   // use a new id as the name to avoid name collisions
   async init(appName = newid()) {
-    this.defaultUserValues = this.populateDefaultUserValues()
-    if (context.isMultiTenant()) {
-      this.tenantId = structures.tenant.id()
-    }
-
     if (!this.started) {
       await startup()
     }
@@ -181,30 +149,9 @@ class TestConfiguration {
     }
   }
 
-  // MODES
-  #setMultiTenancy = (value: boolean) => {
-    env._set("MULTI_TENANCY", value)
-    coreEnv._set("MULTI_TENANCY", value)
-  }
-
-  #setSelfHosted = (value: boolean) => {
-    env._set("SELF_HOSTED", value)
-    coreEnv._set("SELF_HOSTED", value)
-  }
-
-  modeCloud = () => {
-    this.#setSelfHosted(false)
-    this.#setMultiTenancy(true)
-  }
-
-  modeSelf = () => {
-    this.#setSelfHosted(true)
-    this.#setMultiTenancy(false)
-  }
-
   // UTILS
 
-  _req(body: any, params: any, controlFunc: any) {
+  async _req(body: any, params: any, controlFunc: any) {
     // create a fake request ctx
     const request: any = {}
     const appId = this.appId
@@ -212,7 +159,7 @@ class TestConfiguration {
     // fake cookies, we don't need them
     request.cookies = { set: () => {}, get: () => {} }
     request.config = { jwtSecret: env.JWT_SECRET }
-    request.user = { appId, tenantId: this.getTenantId() }
+    request.user = { appId, tenantId: TENANT_ID }
     request.query = {}
     request.request = {
       body,
@@ -228,70 +175,61 @@ class TestConfiguration {
 
   // USER / AUTH
   async globalUser({
-    id = this.defaultUserValues.globalUserId,
-    firstName = this.defaultUserValues.firstName,
-    lastName = this.defaultUserValues.lastName,
+    id = GLOBAL_USER_ID,
+    firstName = FIRSTNAME,
+    lastName = LASTNAME,
     builder = true,
     admin = false,
-    email = this.defaultUserValues.email,
+    email = EMAIL,
     roles,
   }: any = {}) {
-    const db = tenancy.getTenantDB(this.getTenantId())
-    let existing
-    try {
-      existing = await db.get(id)
-    } catch (err) {
-      existing = { email }
-    }
-    const user = {
-      _id: id,
-      ...existing,
-      roles: roles || {},
-      tenantId: this.getTenantId(),
-      firstName,
-      lastName,
-    }
-    await sessions.createASession(id, {
-      sessionId: "sessionid",
-      tenantId: this.getTenantId(),
-      csrfToken: this.defaultUserValues.csrfToken,
+    return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => {
+      let existing
+      try {
+        existing = await db.get(id)
+      } catch (err) {
+        existing = { email }
+      }
+      const user = {
+        _id: id,
+        ...existing,
+        roles: roles || {},
+        tenantId: TENANT_ID,
+        firstName,
+        lastName,
+      }
+      await sessions.createASession(id, {
+        sessionId: "sessionid",
+        tenantId: TENANT_ID,
+        csrfToken: CSRF_TOKEN,
+      })
+      if (builder) {
+        user.builder = { global: true }
+      } else {
+        user.builder = { global: false }
+      }
+      if (admin) {
+        user.admin = { global: true }
+      } else {
+        user.admin = { global: false }
+      }
+      const resp = await db.put(user)
+      return {
+        _rev: resp._rev,
+        ...user,
+      }
     })
-    if (builder) {
-      user.builder = { global: true }
-    } else {
-      user.builder = { global: false }
-    }
-    if (admin) {
-      user.admin = { global: true }
-    } else {
-      user.admin = { global: false }
-    }
-    const resp = await db.put(user)
-    return {
-      _rev: resp.rev,
-      ...user,
-    }
   }
 
   async createUser(
-    user: {
-      id?: string
-      firstName?: string
-      lastName?: string
-      email?: string
-      builder?: boolean
-      admin?: boolean
-      roles?: any
-    } = {}
+    id = null,
+    firstName = FIRSTNAME,
+    lastName = LASTNAME,
+    email = EMAIL,
+    builder = true,
+    admin = false,
+    roles = {}
   ) {
-    let { id, firstName, lastName, email, builder, admin, roles } = user
-    firstName = firstName || this.defaultUserValues.firstName
-    lastName = lastName || this.defaultUserValues.lastName
-    email = email || this.defaultUserValues.email
-    roles = roles || {}
-    if (builder == null) {
-      builder = true
-    }
     const globalId = !id ? `us_${Math.random()}` : `us_${id}`
     const resp = await this.globalUser({
       id: globalId,
@@ -326,13 +264,13 @@ class TestConfiguration {
       }
       await sessions.createASession(userId, {
         sessionId: "sessionid",
-        tenantId: this.getTenantId(),
+        tenantId: TENANT_ID,
       })
       // have to fake this
       const authObj = {
         userId,
         sessionId: "sessionid",
-        tenantId: this.getTenantId(),
+        tenantId: TENANT_ID,
       }
       const app = {
         roleId: roleId,
@@ -355,11 +293,10 @@ class TestConfiguration {
   }
 
   defaultHeaders(extras = {}) {
-    const tenantId = this.getTenantId()
-    const authObj: AuthToken = {
-      userId: this.defaultUserValues.globalUserId,
+    const authObj = {
+      userId: GLOBAL_USER_ID,
       sessionId: "sessionid",
-      tenantId,
+      tenantId: TENANT_ID,
     }
     const app = {
       roleId: roles.BUILTIN_ROLE_IDS.ADMIN,
@@ -373,20 +310,15 @@ class TestConfiguration {
         `${constants.Cookie.Auth}=${authToken}`,
         `${constants.Cookie.CurrentApp}=${appToken}`,
       ],
-      [constants.Header.CSRF_TOKEN]: this.defaultUserValues.csrfToken,
+      [constants.Header.CSRF_TOKEN]: CSRF_TOKEN,
       ...extras,
     }
-
     if (this.appId) {
       headers[constants.Header.APP_ID] = this.appId
     }
     return headers
   }
 
-  getTenantId() {
-    return this.tenantId || TENANT_ID
-  }
-
   publicHeaders({ prodApp = true } = {}) {
     const appId = prodApp ? this.prodAppId : this.appId
 
@@ -396,16 +328,11 @@ class TestConfiguration {
     if (appId) {
       headers[constants.Header.APP_ID] = appId
     }
-
-    if (this.tenantId) {
-      headers[constants.Header.TENANT_ID] = this.tenantId
-    }
-
     return headers
   }
 
   async roleHeaders({
-    email = this.defaultUserValues.email,
+    email = EMAIL,
     roleId = roles.BUILTIN_ROLE_IDS.ADMIN,
     builder = false,
     prodApp = true,
@@ -415,20 +342,21 @@ class TestConfiguration {
 
   // API
 
-  async generateApiKey(userId = this.defaultUserValues.globalUserId) {
-    const db = tenancy.getTenantDB(this.getTenantId())
-    const id = dbCore.generateDevInfoID(userId)
-    let devInfo
-    try {
-      devInfo = await db.get(id)
-    } catch (err) {
-      devInfo = { _id: id, userId }
-    }
-    devInfo.apiKey = encryption.encrypt(
-      `${this.getTenantId()}${dbCore.SEPARATOR}${newid()}`
-    )
-    await db.put(devInfo)
-    return devInfo.apiKey
+  async generateApiKey(userId = GLOBAL_USER_ID) {
+    return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => {
+      const id = dbCore.generateDevInfoID(userId)
+      let devInfo
+      try {
+        devInfo = await db.get(id)
+      } catch (err) {
+        devInfo = { _id: id, userId }
+      }
+      devInfo.apiKey = encryption.encrypt(
+        `${TENANT_ID}${dbCore.SEPARATOR}${newid()}`
+      )
+      await db.put(devInfo)
+      return devInfo.apiKey
+    })
   }
 
   // APP
@@ -480,13 +408,13 @@ class TestConfiguration {
 
   // TABLE
 
-  async updateTable(config?: any): Promise<Table> {
+  async updateTable(config?: any) {
     config = config || basicTable()
     this.table = await this._req(config, null, controllers.table.save)
     return this.table
   }
 
-  async createTable(config?: Table) {
+  async createTable(config?: any) {
     if (config != null && config._id) {
       delete config._id
     }
@@ -530,7 +458,7 @@ class TestConfiguration {
 
   // ROW
 
-  async createRow(config?: Row): Promise<Row> {
+  async createRow(config: any = null) {
     if (!this.table) {
       throw "Test requires table to be configured."
     }
@@ -539,7 +467,7 @@ class TestConfiguration {
     return this._req(config, { tableId }, controllers.row.save)
   }
 
-  async getRow(tableId: string, rowId: string): Promise<Row> {
+  async getRow(tableId: string, rowId: string) {
     return this._req(null, { tableId, rowId }, controllers.row.find)
   }
 
@@ -621,9 +549,7 @@ class TestConfiguration {
 
   // DATASOURCE
 
-  async createDatasource(config?: {
-    datasource: Datasource
-  }): Promise<Datasource> {
+  async createDatasource(config?: any) {
     config = config || basicDatasource()
     const response = await this._req(config, null, controllers.datasource.save)
     this.datasource = response.datasource
@@ -644,7 +570,7 @@ class TestConfiguration {
     return this.createDatasource({
       datasource: {
         ...basicDatasource().datasource,
-        source: SourceName.REST,
+        source: "REST",
         config: cfg || {},
       },
     })
@@ -653,7 +579,7 @@ class TestConfiguration {
   async dynamicVariableDatasource() {
     let datasource = await this.restDatasource()
     const basedOnQuery = await this.createQuery({
-      ...basicQuery(datasource._id!),
+      ...basicQuery(datasource._id),
       fields: {
         path: "www.google.com",
       },
@@ -681,7 +607,7 @@ class TestConfiguration {
     datasource: any,
     fields: any,
     params: any,
-    verb?: string
+    verb: string
   ) {
     return request
       .post(`/api/queries/preview`)

package/src/tests/utilities/structures.ts

@@ -7,8 +7,6 @@ import {
   Automation,
   AutomationActionStepId,
   AutomationTriggerStepId,
-  Datasource,
-  SourceName,
 } from "@budibase/types"
 
 const { v4: uuidv4 } = require("uuid")
@@ -209,12 +207,12 @@ export function basicRole() {
   }
 }
 
-export function basicDatasource(): { datasource: Datasource } {
+export function basicDatasource() {
   return {
     datasource: {
       type: "datasource",
       name: "Test",
-      source: SourceName.POSTGRES,
+      source: "POSTGRES",
       config: {},
     },
   }
@@ -257,15 +255,3 @@ export function basicWebhook(automationId: string) {
     },
   }
 }
-
-export function basicEnvironmentVariable(
-  name: string,
-  prod: string,
-  dev?: string
-) {
-  return {
-    name,
-    production: prod,
-    development: dev || prod,
-  }
-}

package/src/utilities/redis.ts

@@ -21,8 +21,6 @@ export async function shutdown() {
   if (devAppClient) await devAppClient.finish()
   if (debounceClient) await debounceClient.finish()
   if (flagClient) await flagClient.finish()
-  // shutdown core clients
-  await redis.clients.shutdown()
   console.log("Redis shutdown")
 }
 

package/tsconfig.build.json

@@ -20,7 +20,6 @@
     "dist",
     "src/tests",
     "src/api/routes/tests/utilities",
-    "src/api/routes/public/tests/utils.ts",
     "src/automations/tests/utilities",
     "**/*.spec.ts",
     "**/*.spec.js"