@budibase/server 2.3.17-alpha.1 → 2.3.17

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,15 +175,15 @@ 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 = {}) {
-    return tenancy.doWithGlobalDB(this.getTenantId(), async (db: Database) => {
+    return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => {
       let existing
       try {
         existing = await db.get(id)
@@ -247,14 +194,14 @@ class TestConfiguration {
         _id: id,
         ...existing,
         roles: roles || {},
-        tenantId: this.getTenantId(),
+        tenantId: TENANT_ID,
         firstName,
         lastName,
       }
       await sessions.createASession(id, {
         sessionId: "sessionid",
-        tenantId: this.getTenantId(),
-        csrfToken: this.defaultUserValues.csrfToken,
+        tenantId: TENANT_ID,
+        csrfToken: CSRF_TOKEN,
       })
       if (builder) {
         user.builder = { global: true }
@@ -268,31 +215,21 @@ class TestConfiguration {
       }
       const resp = await db.put(user)
       return {
-        _rev: resp.rev,
+        _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,
@@ -327,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,
@@ -356,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,
@@ -374,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
 
@@ -397,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,
@@ -416,8 +342,8 @@ class TestConfiguration {
 
   // API
 
-  async generateApiKey(userId = this.defaultUserValues.globalUserId) {
-    return tenancy.doWithGlobalDB(this.getTenantId(), async (db: any) => {
+  async generateApiKey(userId = GLOBAL_USER_ID) {
+    return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => {
       const id = dbCore.generateDevInfoID(userId)
       let devInfo
       try {
@@ -426,7 +352,7 @@ class TestConfiguration {
         devInfo = { _id: id, userId }
       }
       devInfo.apiKey = encryption.encrypt(
-        `${this.getTenantId()}${dbCore.SEPARATOR}${newid()}`
+        `${TENANT_ID}${dbCore.SEPARATOR}${newid()}`
       )
       await db.put(devInfo)
       return devInfo.apiKey
@@ -482,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
     }
@@ -532,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."
     }
@@ -541,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)
   }
 
@@ -623,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
@@ -646,7 +570,7 @@ class TestConfiguration {
     return this.createDatasource({
       datasource: {
         ...basicDatasource().datasource,
-        source: SourceName.REST,
+        source: "REST",
         config: cfg || {},
       },
     })
@@ -655,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",
       },
@@ -683,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/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"

package/dist/ddApm.js

@@ -1,11 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const dd_trace_1 = __importDefault(require("dd-trace"));
-// enable APM if configured
-if (process.env.DD_APM_ENABLED) {
-    console.log("Starting dd-trace");
-    dd_trace_1.default.init();
-}

package/dist/elasticApm.js

@@ -1,14 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const elastic_apm_node_1 = __importDefault(require("elastic-apm-node"));
-// enable APM if configured
-if (process.env.ELASTIC_APM_ENABLED) {
-    console.log("Starting elastic-apm-node");
-    elastic_apm_node_1.default.start({
-        serviceName: process.env.SERVICE,
-        environment: process.env.BUDIBASE_ENVIRONMENT,
-    });
-}

package/dist/utilities/retry.js

@@ -1,30 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.retry = void 0;
-function retry(fn, maxTry = 5, retryCount = 1) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const currRetry = typeof retryCount === "number" ? retryCount : 1;
-        try {
-            const result = yield fn();
-            return result;
-        }
-        catch (e) {
-            console.log(`Retry ${currRetry} failed.`);
-            if (currRetry > maxTry) {
-                console.log(`All ${maxTry} retry attempts exhausted`);
-                throw e;
-            }
-            return retry(fn, maxTry, currRetry + 1);
-        }
-    });
-}
-exports.retry = retry;

package/jest-testcontainers-config.js

@@ -1,8 +0,0 @@
-const { join } = require("path")
-require("dotenv").config({
-  path: join(__dirname, "..", "..", "hosting", ".env"),
-})
-
-const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator")
-
-module.exports = jestTestcontainersConfigGenerator()

package/scripts/load/create-many-apps.js

@@ -1,24 +0,0 @@
-#!/bin/node
-const { createApp } = require("./utils")
-
-const APP_COUNT = 100
-
-if (!process.argv[2]) {
-  console.error("Please specify an API key as script argument.")
-  process.exit(-1)
-}
-
-async function run() {
-  for (let i = 0; i < APP_COUNT; i++) {
-    const app = await createApp(process.argv[2])
-    console.log(`App created: ${app._id}`)
-  }
-}
-
-run()
-  .then(() => {
-    console.log(`Finished creating ${APP_COUNT} apps.`)
-  })
-  .catch(err => {
-    console.error(err)
-  })

package/scripts/load/create-many-rows.js

@@ -1,30 +0,0 @@
-#!/bin/node
-const { createApp, getTable, createRow } = require("./utils")
-
-const ROW_COUNT = 1000
-
-if (!process.argv[2]) {
-  console.error("Please specify an API key as script argument.")
-  process.exit(-1)
-}
-
-async function run() {
-  const apiKey = process.argv[2]
-  const app = await createApp(apiKey)
-  console.log(`App created: ${app._id}`)
-  const table = await getTable(apiKey, app._id)
-  console.log(`Table found: ${table.name}`)
-  const promises = []
-  for (let i = 0; i < ROW_COUNT; i++) {
-    promises.push(await createRow(apiKey, app._id, table))
-  }
-  await Promise.all(promises)
-}
-
-run()
-  .then(() => {
-    console.log(`Finished creating ${ROW_COUNT} rows.`)
-  })
-  .catch(err => {
-    console.error(err)
-  })

package/scripts/load/utils.js

@@ -1,66 +0,0 @@
-const fetch = require("node-fetch")
-const uuid = require("uuid/v4")
-
-const URL_APP = "http://localhost:10000/api/public/v1/applications"
-const URL_TABLE = "http://localhost:10000/api/public/v1/tables/search"
-
-async function request(apiKey, url, method, body, appId = undefined) {
-  const headers = {
-    "x-budibase-api-key": apiKey,
-    "Content-Type": "application/json",
-  }
-  if (appId) {
-    headers["x-budibase-app-id"] = appId
-  }
-  const res = await fetch(url, {
-    method,
-    headers,
-    body: JSON.stringify(body),
-  })
-  if (res.status !== 200) {
-    throw new Error(await res.text())
-  }
-  return res
-}
-
-exports.createApp = async apiKey => {
-  const name = uuid().replace(/-/g, "")
-  const body = {
-    name,
-    url: `/${name}`,
-    useTemplate: "true",
-    templateKey: "app/school-admin-panel",
-    templateName: "School Admin Panel",
-  }
-  const res = await request(apiKey, URL_APP, "POST", body)
-  const json = await res.json()
-  return json.data
-}
-
-exports.getTable = async (apiKey, appId) => {
-  const res = await request(apiKey, URL_TABLE, "POST", {}, appId)
-  const json = await res.json()
-  return json.data[0]
-}
-
-exports.createRow = async (apiKey, appId, table) => {
-  const body = {}
-  for (let [key, schema] of Object.entries(table.schema)) {
-    let fake
-    switch (schema.type) {
-      default:
-      case "string":
-        fake = schema.constraints.inclusion
-          ? schema.constraints.inclusion[0]
-          : "a"
-        break
-      case "number":
-        fake = 1
-        break
-    }
-    body[key] = fake
-  }
-  const url = `http://localhost:10000/api/public/v1/tables/${table._id}/rows`
-  const res = await request(apiKey, url, "POST", body, appId)
-  return (await res.json()).data
-}