@budibase/server 2.1.45 → 2.1.46-alpha.0

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

@@ -1,10 +1,8 @@
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const {
-  BUILTIN_PERMISSION_IDS,
-} = require("@budibase/backend-core/permissions")
+const { roles, events, permissions } = require("@budibase/backend-core")
 const setup = require("./utilities")
 const { basicRole } = setup.structures
-const { events } = require("@budibase/backend-core")
+const { BUILTIN_ROLE_IDS } = roles
+const { BuiltinPermissionID } = permissions
 
 describe("/roles", () => {
   let request = setup.getRequest()
@@ -76,18 +74,18 @@ describe("/roles", () => {
       const adminRole = res.body.find(r => r._id === BUILTIN_ROLE_IDS.ADMIN)
       expect(adminRole).toBeDefined()
       expect(adminRole.inherits).toEqual(BUILTIN_ROLE_IDS.POWER)
-      expect(adminRole.permissionId).toEqual(BUILTIN_PERMISSION_IDS.ADMIN)
+      expect(adminRole.permissionId).toEqual(BuiltinPermissionID.ADMIN)
 
       const powerUserRole = res.body.find(r => r._id === BUILTIN_ROLE_IDS.POWER)
       expect(powerUserRole).toBeDefined()
       expect(powerUserRole.inherits).toEqual(BUILTIN_ROLE_IDS.BASIC)
-      expect(powerUserRole.permissionId).toEqual(BUILTIN_PERMISSION_IDS.POWER)
+      expect(powerUserRole.permissionId).toEqual(BuiltinPermissionID.POWER)
 
       const customRoleFetched = res.body.find(r => r._id === customRole._id)
       expect(customRoleFetched).toBeDefined()
       expect(customRoleFetched.inherits).toEqual(BUILTIN_ROLE_IDS.BASIC)
       expect(customRoleFetched.permissionId).toEqual(
-        BUILTIN_PERMISSION_IDS.READ_ONLY
+        BuiltinPermissionID.READ_ONLY
       )
     })
 
@@ -109,7 +107,7 @@ describe("/roles", () => {
     it("should delete custom roles", async () => {
       const customRole = await config.createRole({
         name: "user",
-        permissionId: BUILTIN_PERMISSION_IDS.READ_ONLY,
+        permissionId: BuiltinPermissionID.READ_ONLY,
         inherits: BUILTIN_ROLE_IDS.BASIC,
       })
       delete customRole._rev_tree

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

@@ -1,7 +1,8 @@
 const setup = require("./utilities")
 const { basicScreen } = setup.structures
 const { checkBuilderEndpoint, runInProd } = require("./utilities/TestFunctions")
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
+const { roles } = require("@budibase/backend-core")
+const { BUILTIN_ROLE_IDS } = roles
 
 const route = "/test"
 

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

@@ -1,8 +1,7 @@
 const { outputProcessing } = require("../../../utilities/rowProcessor")
 const setup = require("./utilities")
 const { basicRow } = setup.structures
-const { doInAppContext } = require("@budibase/backend-core/context")
-const { doInTenant } = require("@budibase/backend-core/tenancy")
+const { context, tenancy } = require("@budibase/backend-core")
 const {
   quotas,
 } = require("@budibase/pro")
@@ -447,7 +446,7 @@ describe("/rows", () => {
 
   describe("fetchEnrichedRows", () => {
     it("should allow enriching some linked rows", async () => {
-      const { table, firstRow, secondRow } = await doInTenant(
+      const { table, firstRow, secondRow } = await tenancy.doInTenant(
         setup.structures.TENANT_ID,
         async () => {
           const table = await config.createLinkedTable()
@@ -507,7 +506,7 @@ describe("/rows", () => {
       })
       // the environment needs configured for this
       await setup.switchToSelfHosted(async () => {
-        doInAppContext(config.getAppId(), async () => {
+        context.doInAppContext(config.getAppId(), async () => {
           const enriched = await outputProcessing(table, [row])
           expect(enriched[0].attachment[0].url).toBe(
             `/prod-budi-app-assets/${config.getAppId()}/attachments/test/thing.csv`

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

@@ -46,7 +46,7 @@ describe("/static", () => {
 
     it("should serve the app by id", async () => {
       const headers = config.defaultHeaders()
-      delete headers[constants.Headers.APP_ID]
+      delete headers[constants.Header.APP_ID]
 
       const res = await request
         .get(`/${config.prodAppId}`)
@@ -58,7 +58,7 @@ describe("/static", () => {
 
     it("should serve the app by url", async () => {
       const headers = config.defaultHeaders()
-      delete headers[constants.Headers.APP_ID]
+      delete headers[constants.Header.APP_ID]
 
       const res = await request
         .get(`/app${config.prodApp.url}`)

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

@@ -1,17 +1,18 @@
 const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
-const { getAppDB } = require("@budibase/backend-core/context")
 const setup = require("./utilities")
 const { basicTable } = setup.structures
-const { events } = require("@budibase/backend-core")
+const { events, context } = require("@budibase/backend-core")
 
 describe("/tables", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
+  let appId
 
   afterAll(setup.afterAll)
 
   beforeEach(async () => {
-    await config.init()
+    const app = await config.init()
+    appId = app.appId
   })
 
   describe("create", () => {
@@ -199,38 +200,6 @@ describe("/tables", () => {
     })
   })
 
-  describe("indexing", () => {
-    it("should be able to create a table with indexes", async () => {
-      const db = getAppDB(config)
-      const indexCount = (await db.getIndexes()).total_rows
-      const table = basicTable()
-      table.indexes = ["name"]
-      const res = await request
-        .post(`/api/tables`)
-        .send(table)
-        .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
-        .expect(200)
-      expect(res.body._id).toBeDefined()
-      expect(res.body._rev).toBeDefined()
-      expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
-      // update index to see what happens
-      table.indexes = ["name", "description"]
-      await request
-        .post(`/api/tables`)
-        .send({
-          ...table,
-          _id: res.body._id,
-          _rev: res.body._rev,
-        })
-        .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
-        .expect(200)
-      // shouldn't have created a new index
-      expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
-    })
-  })
-
   describe("validate csv", () => {
     it("should be able to validate a CSV layout", async () => {
       const res = await request
@@ -249,6 +218,40 @@ describe("/tables", () => {
     })
   })
 
+  describe("indexing", () => {
+    it("should be able to create a table with indexes", async () => {
+      await context.doInAppContext(appId, async () => {
+        const db = context.getAppDB()
+        const indexCount = (await db.getIndexes()).total_rows
+        const table = basicTable()
+        table.indexes = ["name"]
+        const res = await request
+          .post(`/api/tables`)
+          .send(table)
+          .set(config.defaultHeaders())
+          .expect('Content-Type', /json/)
+          .expect(200)
+        expect(res.body._id).toBeDefined()
+        expect(res.body._rev).toBeDefined()
+        expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
+        // update index to see what happens
+        table.indexes = ["name", "description"]
+        await request
+          .post(`/api/tables`)
+          .send({
+            ...table,
+            _id: res.body._id,
+            _rev: res.body._rev,
+          })
+          .set(config.defaultHeaders())
+          .expect('Content-Type', /json/)
+          .expect(200)
+        // shouldn't have created a new index
+        expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
+      })
+    })
+  })
+
   describe("destroy", () => {
     let testTable
 
@@ -268,7 +271,7 @@ describe("/tables", () => {
         .expect(200)
       expect(res.body.message).toEqual(`Table ${testTable._id} deleted.`)
       expect(events.table.deleted).toBeCalledTimes(1)
-      expect(events.table.deleted).toBeCalledWith(testTable)
+      expect(events.table.deleted).toBeCalledWith({ ...testTable, tableId: testTable._id })
     })
 
     it("deletes linked references to the table after deletion", async () => {
@@ -285,6 +288,7 @@ describe("/tables", () => {
           },
           TestTable: {
             type: "link",
+            fieldName: "TestTable",
             tableId: testTable._id,
             constraints: {
               type: "array"

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

@@ -1,6 +1,7 @@
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
+const { roles } = require("@budibase/backend-core")
 const { checkPermissionsEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
+const { BUILTIN_ROLE_IDS } = roles
 
 jest.mock("../../../utilities/workerRequests", () => ({
   getGlobalUsers: jest.fn(() => {

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

@@ -1,10 +1,8 @@
 import * as rowController from "../../../controllers/row"
 import * as appController from "../../../controllers/application"
 import { AppStatus } from "../../../../db/utils"
-import { BUILTIN_ROLE_IDS } from "@budibase/backend-core/roles"
-import { doInTenant } from "@budibase/backend-core/tenancy"
+import { roles, tenancy, context } from "@budibase/backend-core"
 import { TENANT_ID } from "../../../../tests/utilities/structures"
-import { getAppDB, doInAppContext } from "@budibase/backend-core/context"
 import * as env from "../../../../environment"
 
 class Request {
@@ -21,7 +19,7 @@ class Request {
 }
 
 function runRequest(appId: any, controlFunc: any, request?: any) {
-  return doInAppContext(appId, async () => {
+  return context.doInAppContext(appId, async () => {
     return controlFunc(request)
   })
 }
@@ -33,7 +31,7 @@ export const getAllTableRows = async (config: any) => {
 }
 
 export const clearAllApps = async (tenantId = TENANT_ID) => {
-  await doInTenant(tenantId, async () => {
+  await tenancy.doInTenant(tenantId, async () => {
     const req: any = { query: { status: AppStatus.DEV }, user: { tenantId } }
     await appController.fetch(req)
     const apps = req.body
@@ -51,7 +49,7 @@ export const clearAllApps = async (tenantId = TENANT_ID) => {
 export const clearAllAutomations = async (config: any) => {
   const automations = await config.getAllAutomations()
   for (let auto of automations) {
-    await doInAppContext(config.appId, async () => {
+    await context.doInAppContext(config.appId, async () => {
       await config.deleteAutomation(auto)
     })
   }
@@ -110,7 +108,7 @@ export const checkPermissionsEndpoint = async ({
     .expect(200)
 
   let failHeader
-  if (failRole === BUILTIN_ROLE_IDS.PUBLIC) {
+  if (failRole === roles.BUILTIN_ROLE_IDS.PUBLIC) {
     failHeader = config.publicHeaders({ prodApp: true })
   } else {
     failHeader = await config.login({
@@ -127,7 +125,7 @@ export const checkPermissionsEndpoint = async ({
 }
 
 export const getDB = () => {
-  return getAppDB()
+  return context.getAppDB()
 }
 
 export const testAutomation = async (config: any, automation: any) => {

package/src/api/routes/tests/utilities/{index.js → index.ts}

@@ -1,6 +1,6 @@
-const TestConfig = require("../../../../tests/utilities/TestConfiguration")
-const structures = require("../../../../tests/utilities/structures")
-const env = require("../../../../environment")
+import TestConfig from "../../../../tests/utilities/TestConfiguration"
+import env from "../../../../environment"
+export * as structures from "../../../../tests/utilities/structures"
 
 function user() {
   return {
@@ -40,16 +40,18 @@ jest.mock("../../../../utilities/workerRequests", () => ({
   removeAppFromUserRoles: jest.fn(),
 }))
 
-exports.delay = ms => new Promise(resolve => setTimeout(resolve, ms))
+export function delay(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
 
-let request, config
+let request: any, config: any
 
-exports.beforeAll = () => {
+export function beforeAll() {
   config = new TestConfig()
   request = config.getRequest()
 }
 
-exports.afterAll = () => {
+export function afterAll() {
   if (config) {
     config.end()
   }
@@ -59,21 +61,21 @@ exports.afterAll = () => {
   config = null
 }
 
-exports.getRequest = () => {
+export function getRequest() {
   if (!request) {
     exports.beforeAll()
   }
   return request
 }
 
-exports.getConfig = () => {
+export function getConfig() {
   if (!config) {
     exports.beforeAll()
   }
   return config
 }
 
-exports.switchToSelfHosted = async func => {
+export async function switchToSelfHosted(func: any) {
   // self hosted stops any attempts to Dynamo
   env._set("NODE_ENV", "production")
   env._set("SELF_HOSTED", true)
@@ -90,5 +92,3 @@ exports.switchToSelfHosted = async func => {
     throw error
   }
 }
-
-exports.structures = structures

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

@@ -347,7 +347,7 @@ describe("/views", () => {
 
     const setupExport = async () => {
       const table = await config.createTable()
-      await config.createRow({ name: "test-name", description: "test-desc" })
+      await config.createRow({ name: "test-name", description: "ùúûü" })
       return table
     }
 
@@ -362,11 +362,11 @@ describe("/views", () => {
       const rows = JSON.parse(res.text)
       expect(rows.length).toBe(1)
       expect(rows[0].name).toBe("test-name")
-      expect(rows[0].description).toBe("test-desc")
+      expect(rows[0].description).toBe("ùúûü")
     }
 
     const assertCSVExport = (res) => {
-      expect(res.text).toBe("\"name\",\"description\"\n\"test-name\",\"test-desc\"")
+      expect(res.text).toBe(`"name","description"\n"test-name","ùúûü"`)
     }
 
     it("should be able to export a table as JSON", async () => {

package/src/api/routes/user.ts

@@ -0,0 +1,51 @@
+import Router from "@koa/router"
+import * as controller from "../controllers/user"
+import authorized from "../../middleware/authorized"
+import { permissions } from "@budibase/backend-core"
+const { PermissionType, PermissionLevel } = permissions
+
+const router: Router = new Router()
+
+router
+  .get(
+    "/api/users/metadata",
+    authorized(PermissionType.USER, PermissionLevel.READ),
+    controller.fetchMetadata
+  )
+  .get(
+    "/api/users/metadata/:id",
+    authorized(PermissionType.USER, PermissionLevel.READ),
+    controller.findMetadata
+  )
+  .put(
+    "/api/users/metadata",
+    authorized(PermissionType.USER, PermissionLevel.WRITE),
+    controller.updateMetadata
+  )
+  .post(
+    "/api/users/metadata/self",
+    authorized(PermissionType.USER, PermissionLevel.WRITE),
+    controller.updateSelfMetadata
+  )
+  .delete(
+    "/api/users/metadata/:id",
+    authorized(PermissionType.USER, PermissionLevel.WRITE),
+    controller.destroyMetadata
+  )
+  .post(
+    "/api/users/metadata/sync/:id",
+    authorized(PermissionType.USER, PermissionLevel.WRITE),
+    controller.syncUser
+  )
+  .post(
+    "/api/users/flags",
+    authorized(PermissionType.USER, PermissionLevel.WRITE),
+    controller.setFlag
+  )
+  .get(
+    "/api/users/flags",
+    authorized(PermissionType.USER, PermissionLevel.READ),
+    controller.getFlags
+  )
+
+export = router

package/src/api/routes/utils/{validators.js → validators.ts}

@@ -1,20 +1,16 @@
-const { joiValidator } = require("@budibase/backend-core/auth")
-const { DataSourceOperation } = require("../../../constants")
-const {
-  BUILTIN_PERMISSION_IDS,
-  PermissionLevels,
-} = require("@budibase/backend-core/permissions")
-const { WebhookActionType } = require("@budibase/types")
-const Joi = require("joi")
+import { auth, permissions } from "@budibase/backend-core"
+import { DataSourceOperation } from "../../../constants"
+import { WebhookActionType } from "@budibase/types"
+import Joi from "joi"
 
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null)
 const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null)
 const APP_NAME_REGEX = /^[\w\s]+$/
 
-exports.tableValidator = () => {
+export function tableValidator() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     type: OPTIONAL_STRING.valid("table", "internal", "external"),
@@ -26,16 +22,16 @@ exports.tableValidator = () => {
   }).unknown(true))
 }
 
-exports.nameValidator = () => {
+export function nameValidator() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     name: OPTIONAL_STRING,
   }))
 }
 
-exports.datasourceValidator = () => {
+export function datasourceValidator() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     _id: Joi.string(),
     _rev: Joi.string(),
     type: OPTIONAL_STRING.allow("datasource_plus"),
@@ -64,9 +60,9 @@ function filterObject() {
   }).unknown(true)
 }
 
-exports.internalSearchValidator = () => {
+export function internalSearchValidator() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     tableId: OPTIONAL_STRING,
     query: filterObject(),
     limit: OPTIONAL_NUMBER,
@@ -78,8 +74,8 @@ exports.internalSearchValidator = () => {
   }))
 }
 
-exports.externalSearchValidator = () => {
-  return joiValidator.body(
+export function externalSearchValidator() {
+  return auth.joiValidator.body(
     Joi.object({
       query: filterObject(),
       paginate: Joi.boolean().optional(),
@@ -96,9 +92,9 @@ exports.externalSearchValidator = () => {
   )
 }
 
-exports.datasourceQueryValidator = () => {
+export function datasourceQueryValidator() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     endpoint: Joi.object({
       datasourceId: Joi.string().required(),
       operation: Joi.string().required().valid(...Object.values(DataSourceOperation)),
@@ -117,9 +113,9 @@ exports.datasourceQueryValidator = () => {
   }))
 }
 
-exports.webhookValidator = () => {
+export function webhookValidator() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     live: Joi.bool(),
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
@@ -132,15 +128,15 @@ exports.webhookValidator = () => {
   }).unknown(true))
 }
 
-exports.roleValidator = () => {
-  const permLevelArray = Object.values(PermissionLevels)
+export function roleValidator() {
+  const permLevelArray = Object.values(permissions.PermissionLevel)
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     name: Joi.string().required(),
     // this is the base permission ID (for now a built in)
-    permissionId: Joi.string().valid(...Object.values(BUILTIN_PERMISSION_IDS)).required(),
+    permissionId: Joi.string().valid(...Object.values(permissions.BuiltinPermissionID)).required(),
     permissions: Joi.object()
       .pattern(/.*/, [Joi.string().valid(...permLevelArray)])
       .optional(),
@@ -148,19 +144,19 @@ exports.roleValidator = () => {
   }).unknown(true))
 }
 
-exports.permissionValidator = () => {
-  const permLevelArray = Object.values(PermissionLevels)
+export function permissionValidator() {
+  const permLevelArray = Object.values(permissions.PermissionLevel)
   // prettier-ignore
-  return joiValidator.params(Joi.object({
+  return auth.joiValidator.params(Joi.object({
     level: Joi.string().valid(...permLevelArray).required(),
     resourceId: Joi.string(),
     roleId: Joi.string(),
   }).unknown(true))
 }
 
-exports.screenValidator = () => {
+export function screenValidator() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     name: Joi.string().required(),
     showNavigation: OPTIONAL_BOOLEAN,
     width: OPTIONAL_STRING,
@@ -181,7 +177,7 @@ exports.screenValidator = () => {
   }).unknown(true))
 }
 
-function generateStepSchema(allowStepTypes) {
+function generateStepSchema(allowStepTypes: string[]) {
   // prettier-ignore
   return Joi.object({
     stepId: Joi.string().required(),
@@ -196,9 +192,9 @@ function generateStepSchema(allowStepTypes) {
   }).unknown(true)
 }
 
-exports.automationValidator = (existing = false) => {
+export function automationValidator(existing = false) {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     _id: existing ? Joi.string().required() : OPTIONAL_STRING,
     _rev: existing ? Joi.string().required() : OPTIONAL_STRING,
     name: Joi.string().required(),
@@ -210,9 +206,9 @@ exports.automationValidator = (existing = false) => {
   }).unknown(true))
 }
 
-exports.applicationValidator = (opts = { isCreate: true }) => {
+export function applicationValidator(opts = { isCreate: true }) {
   // prettier-ignore
-  const base = {
+  const base: any = {
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     url: OPTIONAL_STRING,
@@ -230,7 +226,7 @@ exports.applicationValidator = (opts = { isCreate: true }) => {
     base.name = appNameValidator.optional()
   }
 
-  return joiValidator.body(
+  return auth.joiValidator.body(
     Joi.object({
       _id: OPTIONAL_STRING,
       _rev: OPTIONAL_STRING,

package/src/api/routes/view.ts

@@ -0,0 +1,34 @@
+import Router from "@koa/router"
+import * as viewController from "../controllers/view"
+import * as rowController from "../controllers/row"
+import authorized from "../../middleware/authorized"
+import { paramResource } from "../../middleware/resourceId"
+import { permissions } from "@budibase/backend-core"
+
+const router: Router = new Router()
+
+router
+  .get(
+    "/api/views/export",
+    authorized(permissions.BUILDER),
+    viewController.exportView
+  )
+  .get(
+    "/api/views/:viewName",
+    paramResource("viewName"),
+    authorized(
+      permissions.PermissionType.VIEW,
+      permissions.PermissionLevel.READ
+    ),
+    rowController.fetchView
+  )
+  .get("/api/views", authorized(permissions.BUILDER), viewController.fetch)
+  .delete(
+    "/api/views/:viewName",
+    paramResource("viewName"),
+    authorized(permissions.BUILDER),
+    viewController.destroy
+  )
+  .post("/api/views", authorized(permissions.BUILDER), viewController.save)
+
+export = router

package/src/api/routes/webhook.ts

@@ -5,7 +5,7 @@ import { permissions } from "@budibase/backend-core"
 import { webhookValidator } from "./utils/validators"
 
 const BUILDER = permissions.BUILDER
-const router = new Router()
+const router: Router = new Router()
 
 router
   .get("/api/webhooks", authorized(BUILDER), controller.fetch)
@@ -24,4 +24,4 @@ router
   // this shouldn't have authorisation, right now its always public
   .post("/api/webhooks/trigger/:instance/:id", controller.trigger)
 
-export default router
+export = router