@budibase/server 2.1.40-alpha.6 → 2.1.42

package/src/api/controllers/public/applications.ts

@@ -1,4 +1,5 @@
-import { db as dbCore, context } from "@budibase/backend-core"
+const { getAllApps } = require("@budibase/backend-core/db")
+const { doInAppContext } = require("@budibase/backend-core/context")
 import { search as stringSearch, addRev } from "./utils"
 import * as controller from "../application"
 import { Application } from "../../../definitions/common"
@@ -14,22 +15,15 @@ function fixAppID(app: Application, params: any) {
 }
 
 async function setResponseApp(ctx: any) {
-  const appId = ctx.body?.appId
-  if (appId && (!ctx.params || !ctx.params.appId)) {
-    ctx.params = { appId }
-  }
-  if (appId) {
-    await context.doInContext(appId, () => {
-      return controller.fetchAppPackage(ctx)
-    })
-  } else {
-    return controller.fetchAppPackage(ctx)
+  if (ctx.body && ctx.body.appId && (!ctx.params || !ctx.params.appId)) {
+    ctx.params = { appId: ctx.body.appId }
   }
+  await controller.fetchAppPackage(ctx)
 }
 
 export async function search(ctx: any, next: any) {
   const { name } = ctx.request.body
-  const apps = await dbCore.getAllApps({ all: true })
+  const apps = await getAllApps({ all: true })
   ctx.body = stringSearch(apps, name)
   await next()
 }
@@ -47,7 +41,7 @@ export async function create(ctx: any, next: any) {
 }
 
 export async function read(ctx: any, next: any) {
-  await context.doInAppContext(ctx.params.appId, async () => {
+  await doInAppContext(ctx.params.appId, async () => {
     await setResponseApp(ctx)
     await next()
   })
@@ -55,7 +49,7 @@ export async function read(ctx: any, next: any) {
 
 export async function update(ctx: any, next: any) {
   ctx.request.body = await addRev(fixAppID(ctx.request.body, ctx.params))
-  await context.doInAppContext(ctx.params.appId, async () => {
+  await doInAppContext(ctx.params.appId, async () => {
     await controller.update(ctx)
     await setResponseApp(ctx)
     await next()
@@ -63,7 +57,7 @@ export async function update(ctx: any, next: any) {
 }
 
 export async function destroy(ctx: any, next: any) {
-  await context.doInAppContext(ctx.params.appId, async () => {
+  await doInAppContext(ctx.params.appId, async () => {
     // get the app before deleting it
     await setResponseApp(ctx)
     const body = ctx.body

package/src/api/controllers/public/rows.ts

@@ -1,6 +1,6 @@
 import * as rowController from "../row"
 import { addRev } from "./utils"
-import { Row } from "@budibase/types"
+import { Row } from "../../../definitions/common"
 import { convertBookmark } from "../../../utilities"
 
 // makes sure that the user doesn't need to pass in the type, tableId or _id params for

package/src/api/controllers/public/tables.ts

@@ -1,6 +1,6 @@
 import { search as stringSearch, addRev } from "./utils"
-import * as controller from "../table"
-import { Table } from "@budibase/types"
+import { default as controller } from "../table"
+import { Table } from "../../../definitions/common"
 
 function fixTable(table: Table, params: any) {
   if (!params || !table) {

package/src/api/controllers/public/utils.ts

@@ -1,4 +1,4 @@
-import { context } from "@budibase/backend-core"
+const { getAppDB } = require("@budibase/backend-core/context")
 import { isExternalTable } from "../../../integrations/utils"
 import { APP_PREFIX, DocumentType } from "../../../db/utils"
 
@@ -13,7 +13,7 @@ export async function addRev(
   if (body._id.startsWith(APP_PREFIX)) {
     id = DocumentType.APP_METADATA
   }
-  const db = context.getAppDB()
+  const db = getAppDB()
   const dbDoc = await db.get(id)
   body._rev = dbDoc._rev
   // update ID in case it is an app ID

package/src/api/controllers/query/import/index.ts

@@ -5,7 +5,8 @@ import { OpenAPI2 } from "./sources/openapi2"
 import { OpenAPI3 } from "./sources/openapi3"
 import { Curl } from "./sources/curl"
 // @ts-ignore
-import { events, context } from "@budibase/backend-core"
+import { getAppDB } from "@budibase/backend-core/context"
+import { events } from "@budibase/backend-core"
 import { Datasource, Query } from "@budibase/types"
 
 interface ImportResult {
@@ -58,7 +59,7 @@ export class RestImporter {
       })
 
     // persist queries
-    const db = context.getAppDB()
+    const db = getAppDB()
     const response = await db.bulkDocs(queries)
 
     // create index to seperate queries and errors

package/src/api/controllers/query/index.ts

@@ -5,8 +5,11 @@ import { save as saveDatasource } from "../datasource"
 import { RestImporter } from "./import"
 import { invalidateDynamicVariables } from "../../../threads/utils"
 import { QUERY_THREAD_TIMEOUT } from "../../../environment"
+import { getAppDB } from "@budibase/backend-core/context"
 import { quotas } from "@budibase/pro"
-import { events, context, utils, constants } from "@budibase/backend-core"
+import { events } from "@budibase/backend-core"
+import { getCookie } from "@budibase/backend-core/utils"
+import { Cookies, Configs } from "@budibase/backend-core/constants"
 
 const Runner = new Thread(ThreadType.QUERY, {
   timeoutMs: QUERY_THREAD_TIMEOUT || 10000,
@@ -25,7 +28,7 @@ function enrichQueries(input: any) {
 }
 
 export async function fetch(ctx: any) {
-  const db = context.getAppDB()
+  const db = getAppDB()
 
   const body = await db.allDocs(
     getQueryParams(null, {
@@ -78,7 +81,7 @@ const _import = async (ctx: any) => {
 export { _import as import }
 
 export async function save(ctx: any) {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const query = ctx.request.body
 
   const datasource = await db.get(query.datasourceId)
@@ -100,7 +103,7 @@ export async function save(ctx: any) {
 }
 
 export async function find(ctx: any) {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const query = enrichQueries(await db.get(ctx.params.queryId))
   // remove properties that could be dangerous in real app
   if (isProdAppID(ctx.appId)) {
@@ -112,13 +115,13 @@ export async function find(ctx: any) {
 
 //Required to discern between OIDC OAuth config entries
 function getOAuthConfigCookieId(ctx: any) {
-  if (ctx.user.providerType === constants.Config.OIDC) {
-    return utils.getCookie(ctx, constants.Cookie.OIDC_CONFIG)
+  if (ctx.user.providerType === Configs.OIDC) {
+    return getCookie(ctx, Cookies.OIDC_CONFIG)
   }
 }
 
 function getAuthConfig(ctx: any) {
-  const authCookie = utils.getCookie(ctx, constants.Cookie.Auth)
+  const authCookie = getCookie(ctx, Cookies.Auth)
   let authConfigCtx: any = {}
   authConfigCtx["configId"] = getOAuthConfigCookieId(ctx)
   authConfigCtx["sessionId"] = authCookie ? authCookie.sessionId : null
@@ -126,7 +129,7 @@ function getAuthConfig(ctx: any) {
 }
 
 export async function preview(ctx: any) {
-  const db = context.getAppDB()
+  const db = getAppDB()
 
   const datasource = await db.get(ctx.request.body.datasourceId)
   const query = ctx.request.body
@@ -198,7 +201,7 @@ async function execute(
   ctx: any,
   opts: any = { rowsOnly: false, isAutomation: false }
 ) {
-  const db = context.getAppDB()
+  const db = getAppDB()
 
   const query = await db.get(ctx.params.queryId)
   const datasource = await db.get(query.datasourceId)
@@ -264,7 +267,7 @@ export async function executeV2(
 }
 
 const removeDynamicVariables = async (queryId: any) => {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const query = await db.get(queryId)
   const datasource = await db.get(query.datasourceId)
   const dynamicVariables = datasource.config.dynamicVariables
@@ -285,7 +288,7 @@ const removeDynamicVariables = async (queryId: any) => {
 }
 
 export async function destroy(ctx: any) {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const queryId = ctx.params.queryId
   await removeDynamicVariables(queryId)
   const query = await db.get(queryId)

package/src/api/controllers/query/{validation.ts → validation.js}

@@ -1,9 +1,9 @@
-import { auth } from "@budibase/backend-core"
-import Joi from "joi"
+const { joiValidator } = require("@budibase/backend-core/auth")
+const Joi = require("joi")
 
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 
-export function queryValidation() {
+exports.queryValidation = () => {
   return Joi.object({
     _id: Joi.string(),
     _rev: Joi.string(),
@@ -25,14 +25,14 @@ export function queryValidation() {
   }).unknown(true)
 }
 
-export function generateQueryValidation() {
+exports.generateQueryValidation = () => {
   // prettier-ignore
-  return auth.joiValidator.body(queryValidation())
+  return joiValidator.body(exports.queryValidation())
 }
 
-export function generateQueryPreviewValidation() {
+exports.generateQueryPreviewValidation = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     readable: Joi.boolean().optional(),

package/src/api/controllers/{role.ts → role.js}

@@ -1,21 +1,23 @@
-import { roles, context, events } from "@budibase/backend-core"
-import {
+const {
+  Role,
+  getRole,
+  isBuiltin,
+  getAllRoles,
+} = require("@budibase/backend-core/roles")
+const {
   generateRoleID,
   getUserMetadataParams,
   InternalTables,
-} from "../../db/utils"
-import { BBContext, Database } from "@budibase/types"
+} = require("../../db/utils")
+const { getAppDB } = require("@budibase/backend-core/context")
+const { events } = require("@budibase/backend-core")
 
 const UpdateRolesOptions = {
   CREATED: "created",
   REMOVED: "removed",
 }
 
-async function updateRolesOnUserTable(
-  db: Database,
-  roleId: string,
-  updateOption: string
-) {
+async function updateRolesOnUserTable(db, roleId, updateOption) {
   const table = await db.get(InternalTables.USER_METADATA)
   const schema = table.schema
   const remove = updateOption === UpdateRolesOptions.REMOVED
@@ -38,25 +40,27 @@ async function updateRolesOnUserTable(
   }
 }
 
-export async function fetch(ctx: BBContext) {
-  ctx.body = await roles.getAllRoles()
+exports.fetch = async function (ctx) {
+  ctx.body = await getAllRoles()
 }
 
-export async function find(ctx: BBContext) {
-  ctx.body = await roles.getRole(ctx.params.roleId)
+exports.find = async function (ctx) {
+  ctx.body = await getRole(ctx.params.roleId)
 }
 
-export async function save(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.save = async function (ctx) {
+  const db = getAppDB()
   let { _id, name, inherits, permissionId } = ctx.request.body
   let isCreate = false
   if (!_id) {
     _id = generateRoleID()
     isCreate = true
-  } else if (roles.isBuiltin(_id)) {
+  } else if (isBuiltin(_id)) {
     ctx.throw(400, "Cannot update builtin roles.")
   }
-  const role = new roles.Role(_id, name, permissionId).addInheritance(inherits)
+  const role = new Role(_id, name)
+    .addPermission(permissionId)
+    .addInheritance(inherits)
   if (ctx.request.body._rev) {
     role._rev = ctx.request.body._rev
   }
@@ -72,17 +76,17 @@ export async function save(ctx: BBContext) {
   ctx.message = `Role '${role.name}' created successfully.`
 }
 
-export async function destroy(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.destroy = async function (ctx) {
+  const db = getAppDB()
   const roleId = ctx.params.roleId
   const role = await db.get(roleId)
-  if (roles.isBuiltin(roleId)) {
+  if (isBuiltin(roleId)) {
     ctx.throw(400, "Cannot delete builtin role.")
   }
   // first check no users actively attached to role
   const users = (
     await db.allDocs(
-      getUserMetadataParams(undefined, {
+      getUserMetadataParams(null, {
         include_docs: true,
       })
     )

package/src/api/controllers/{routing.ts → routing.js}

@@ -1,41 +1,40 @@
-import { getRoutingInfo } from "../../utilities/routing"
-import { roles } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+const { getRoutingInfo } = require("../../utilities/routing")
+const {
+  getUserRoleHierarchy,
+  BUILTIN_ROLE_IDS,
+} = require("@budibase/backend-core/roles")
 
 const URL_SEPARATOR = "/"
 
-class Routing {
-  json: any
-  constructor() {
-    this.json = {}
-  }
+function Routing() {
+  this.json = {}
+}
 
-  getTopLevel(fullpath: string) {
-    if (fullpath.charAt(0) !== URL_SEPARATOR) {
-      fullpath = URL_SEPARATOR + fullpath
-    }
-    // replace the first value with the home route
-    return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1]
+Routing.prototype.getTopLevel = function (fullpath) {
+  if (fullpath.charAt(0) !== URL_SEPARATOR) {
+    fullpath = URL_SEPARATOR + fullpath
   }
+  // replace the first value with the home route
+  return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1]
+}
 
-  getScreensProp(fullpath: string) {
-    const topLevel = this.getTopLevel(fullpath)
-    if (!this.json[topLevel]) {
-      this.json[topLevel] = {
-        subpaths: {},
-      }
+Routing.prototype.getScreensProp = function (fullpath) {
+  const topLevel = this.getTopLevel(fullpath)
+  if (!this.json[topLevel]) {
+    this.json[topLevel] = {
+      subpaths: {},
     }
-    if (!this.json[topLevel].subpaths[fullpath]) {
-      this.json[topLevel].subpaths[fullpath] = {
-        screens: {},
-      }
+  }
+  if (!this.json[topLevel].subpaths[fullpath]) {
+    this.json[topLevel].subpaths[fullpath] = {
+      screens: {},
     }
-    return this.json[topLevel].subpaths[fullpath].screens
   }
+  return this.json[topLevel].subpaths[fullpath].screens
+}
 
-  addScreenId(fullpath: string, roleId: string, screenId: string) {
-    this.getScreensProp(fullpath)[roleId] = screenId
-  }
+Routing.prototype.addScreenId = function (fullpath, roleId, screenId) {
+  this.getScreensProp(fullpath)[roleId] = screenId
 }
 
 /**
@@ -56,28 +55,26 @@ async function getRoutingStructure() {
   return { routes: routing.json }
 }
 
-export async function fetch(ctx: BBContext) {
+exports.fetch = async ctx => {
   ctx.body = await getRoutingStructure()
 }
 
-export async function clientFetch(ctx: BBContext) {
+exports.clientFetch = async ctx => {
   const routing = await getRoutingStructure()
-  let roleId = ctx.user?.role?._id
-  const roleIds = (await roles.getUserRoleHierarchy(roleId, {
-    idOnly: true,
-  })) as string[]
-  for (let topLevel of Object.values(routing.routes) as any) {
+  let roleId = ctx.user.role._id
+  const roleIds = await getUserRoleHierarchy(roleId)
+  for (let topLevel of Object.values(routing.routes)) {
     for (let subpathKey of Object.keys(topLevel.subpaths)) {
       let found = false
       const subpath = topLevel.subpaths[subpathKey]
       const roleOptions = Object.keys(subpath.screens)
       if (roleOptions.length === 1 && !roleOptions[0]) {
         subpath.screenId = subpath.screens[roleOptions[0]]
-        subpath.roleId = roles.BUILTIN_ROLE_IDS.BASIC
+        subpath.roleId = BUILTIN_ROLE_IDS.BASIC
         found = true
       } else {
         for (let roleId of roleIds) {
-          if (roleId && roleOptions.indexOf(roleId) !== -1) {
+          if (roleOptions.indexOf(roleId) !== -1) {
             subpath.screenId = subpath.screens[roleId]
             subpath.roleId = roleId
             found = true