@budibase/server 1.0.49-alpha.9 → 1.0.49

package/src/api/controllers/application.js

@@ -1,3 +1,4 @@
+const CouchDB = require("../../db")
 const env = require("../../environment")
 const packageJson = require("../../../package.json")
 const {
@@ -28,11 +29,14 @@ const { processObject } = require("@budibase/string-templates")
 const {
   getAllApps,
   isDevAppID,
-  getProdAppID,
+  getDeployedAppID,
   Replication,
 } = require("@budibase/backend-core/db")
 const { USERS_TABLE_SCHEMA } = require("../../constants")
-const { removeAppFromUserRoles } = require("../../utilities/workerRequests")
+const {
+  getDeployedApps,
+  removeAppFromUserRoles,
+} = require("../../utilities/workerRequests")
 const { clientLibraryPath, stringToReadStream } = require("../../utilities")
 const { getAllLocks } = require("../../utilities/redis")
 const {
@@ -44,17 +48,11 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const { syncGlobalUsers } = require("./user")
 const { app: appCache } = require("@budibase/backend-core/cache")
 const { cleanupAutomations } = require("../../automations/utils")
-const {
-  getAppDB,
-  getProdAppDB,
-  updateAppId,
-} = require("@budibase/backend-core/context")
 
 const URL_REGEX_SLASH = /\/|\\/g
 
 // utility function, need to do away with this
-async function getLayouts() {
-  const db = getAppDB()
+async function getLayouts(db) {
   return (
     await db.allDocs(
       getLayoutParams(null, {
@@ -64,8 +62,7 @@ async function getLayouts() {
   ).rows.map(row => row.doc)
 }
 
-async function getScreens() {
-  const db = getAppDB()
+async function getScreens(db) {
   return (
     await db.allDocs(
       getScreenParams(null, {
@@ -81,51 +78,37 @@ function getUserRoleId(ctx) {
     : ctx.user.role._id
 }
 
-exports.getAppUrl = ctx => {
-  // construct the url
+async function getAppUrlIfNotInUse(ctx) {
   let url
   if (ctx.request.body.url) {
-    // if the url is provided, use that
     url = encodeURI(ctx.request.body.url)
   } else if (ctx.request.body.name) {
-    // otherwise use the name
     url = encodeURI(`${ctx.request.body.name}`)
   }
   if (url) {
     url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase()
   }
-  return url
-}
-
-const checkAppUrl = (ctx, apps, url, currentAppId) => {
-  if (currentAppId) {
-    apps = apps.filter(app => app.appId !== currentAppId)
-  }
-  if (apps.some(app => app.url === url)) {
-    ctx.throw(400, "App URL is already in use.")
-  }
-}
-
-const checkAppName = (ctx, apps, name, currentAppId) => {
-  // TODO: Replace with Joi
-  if (!name) {
-    ctx.throw(400, "Name is required")
-  }
-  if (currentAppId) {
-    apps = apps.filter(app => app.appId !== currentAppId)
+  if (!env.SELF_HOSTED) {
+    return url
   }
-  if (apps.some(app => app.name === name)) {
-    ctx.throw(400, "App name is already in use.")
+  const deployedApps = await getDeployedApps()
+  if (
+    url &&
+    deployedApps[url] != null &&
+    ctx.params != null &&
+    deployedApps[url].appId !== ctx.params.appId
+  ) {
+    ctx.throw(400, "App name/URL is already in use.")
   }
+  return url
 }
 
 async function createInstance(template) {
   const tenantId = isMultiTenant() ? getTenantId() : null
   const baseAppId = generateAppID(tenantId)
   const appId = generateDevAppID(baseAppId)
-  updateAppId(appId)
 
-  const db = getAppDB()
+  const db = new CouchDB(appId)
   await db.put({
     _id: "_design/database",
     // view collation information, read before writing any complex views:
@@ -135,9 +118,9 @@ async function createInstance(template) {
 
   // NOTE: indexes need to be created before any tables/templates
   // add view for linked rows
-  await createLinkView()
-  await createRoutingView()
-  await createAllSearchIndex()
+  await createLinkView(appId)
+  await createRoutingView(appId)
+  await createAllSearchIndex(appId)
 
   // replicate the template data to the instance DB
   // this is currently very hard to test, downloading and importing template files
@@ -163,7 +146,7 @@ async function createInstance(template) {
 exports.fetch = async ctx => {
   const dev = ctx.query && ctx.query.status === AppStatus.DEV
   const all = ctx.query && ctx.query.status === AppStatus.ALL
-  const apps = await getAllApps({ dev, all })
+  const apps = await getAllApps(CouchDB, { dev, all })
 
   // get the locks for all the dev apps
   if (dev || all) {
@@ -186,11 +169,12 @@ exports.fetch = async ctx => {
 }
 
 exports.fetchAppDefinition = async ctx => {
-  const layouts = await getLayouts()
+  const db = new CouchDB(ctx.params.appId)
+  const layouts = await getLayouts(db)
   const userRoleId = getUserRoleId(ctx)
-  const accessController = new AccessController()
+  const accessController = new AccessController(ctx.params.appId)
   const screens = await accessController.checkScreensAccess(
-    await getScreens(),
+    await getScreens(db),
     userRoleId
   )
   ctx.body = {
@@ -201,15 +185,15 @@ exports.fetchAppDefinition = async ctx => {
 }
 
 exports.fetchAppPackage = async ctx => {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.params.appId)
   const application = await db.get(DocumentTypes.APP_METADATA)
-  const layouts = await getLayouts()
-  let screens = await getScreens()
+  const layouts = await getLayouts(db)
+  let screens = await getScreens(db)
 
   // Only filter screens if the user is not a builder
   if (!(ctx.user.builder && ctx.user.builder.global)) {
     const userRoleId = getUserRoleId(ctx)
-    const accessController = new AccessController()
+    const accessController = new AccessController(ctx.params.appId)
     screens = await accessController.checkScreensAccess(screens, userRoleId)
   }
 
@@ -222,12 +206,6 @@ exports.fetchAppPackage = async ctx => {
 }
 
 exports.create = async ctx => {
-  const apps = await getAllApps({ dev: true })
-  const name = ctx.request.body.name
-  checkAppName(ctx, apps, name)
-  const url = exports.getAppUrl(ctx)
-  checkAppUrl(ctx, apps, url)
-
   const { useTemplate, templateKey, templateString } = ctx.request.body
   const instanceConfig = {
     useTemplate,
@@ -240,7 +218,8 @@ exports.create = async ctx => {
   const instance = await createInstance(instanceConfig)
   const appId = instance._id
 
-  const db = getAppDB()
+  const url = await getAppUrlIfNotInUse(ctx)
+  const db = new CouchDB(appId)
   let _rev
   try {
     // if template there will be an existing doc
@@ -256,7 +235,7 @@ exports.create = async ctx => {
     type: "app",
     version: packageJson.version,
     componentLibraries: ["@budibase/standard-components"],
-    name: name,
+    name: ctx.request.body.name,
     url: url,
     template: ctx.request.body.template,
     instance: instance,
@@ -283,29 +262,15 @@ exports.create = async ctx => {
   ctx.body = newApplication
 }
 
-// This endpoint currently operates as a PATCH rather than a PUT
-// Thus name and url fields are handled only if present
 exports.update = async ctx => {
-  const apps = await getAllApps({ dev: true })
-  // validation
-  const name = ctx.request.body.name
-  if (name) {
-    checkAppName(ctx, apps, name, ctx.params.appId)
-  }
-  const url = await exports.getAppUrl(ctx)
-  if (url) {
-    checkAppUrl(ctx, apps, url, ctx.params.appId)
-    ctx.request.body.url = url
-  }
-
-  const data = await updateAppPackage(ctx.request.body, ctx.params.appId)
+  const data = await updateAppPackage(ctx, ctx.request.body, ctx.params.appId)
   ctx.status = 200
   ctx.body = data
 }
 
 exports.updateClient = async ctx => {
   // Get current app version
-  const db = getAppDB()
+  const db = new CouchDB(ctx.params.appId)
   const application = await db.get(DocumentTypes.APP_METADATA)
   const currentVersion = application.version
 
@@ -320,14 +285,14 @@ exports.updateClient = async ctx => {
     version: packageJson.version,
     revertableVersion: currentVersion,
   }
-  const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
+  const data = await updateAppPackage(ctx, appPackageUpdates, ctx.params.appId)
   ctx.status = 200
   ctx.body = data
 }
 
 exports.revertClient = async ctx => {
   // Check app can be reverted
-  const db = getAppDB()
+  const db = new CouchDB(ctx.params.appId)
   const application = await db.get(DocumentTypes.APP_METADATA)
   if (!application.revertableVersion) {
     ctx.throw(400, "There is no version to revert to")
@@ -343,13 +308,13 @@ exports.revertClient = async ctx => {
     version: application.revertableVersion,
     revertableVersion: null,
   }
-  const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
+  const data = await updateAppPackage(ctx, appPackageUpdates, ctx.params.appId)
   ctx.status = 200
   ctx.body = data
 }
 
 exports.delete = async ctx => {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.params.appId)
 
   const result = await db.destroy()
   /* istanbul ignore next */
@@ -374,11 +339,10 @@ exports.sync = async (ctx, next) => {
   }
 
   // replicate prod to dev
-  const prodAppId = getProdAppID(appId)
+  const prodAppId = getDeployedAppID(appId)
 
   try {
-    // specific case, want to make sure setup is skipped
-    const prodDb = getProdAppDB({ skip_setup: true })
+    const prodDb = new CouchDB(prodAppId, { skip_setup: true })
     const info = await prodDb.info()
     if (info.error) throw info.error
   } catch (err) {
@@ -406,7 +370,7 @@ exports.sync = async (ctx, next) => {
   }
 
   // sync the users
-  await syncGlobalUsers()
+  await syncGlobalUsers(appId)
 
   if (error) {
     ctx.throw(400, error)
@@ -417,11 +381,12 @@ exports.sync = async (ctx, next) => {
   }
 }
 
-const updateAppPackage = async (appPackage, appId) => {
-  const db = getAppDB()
+const updateAppPackage = async (ctx, appPackage, appId) => {
+  const url = await getAppUrlIfNotInUse(ctx)
+  const db = new CouchDB(appId)
   const application = await db.get(DocumentTypes.APP_METADATA)
 
-  const newAppPackage = { ...application, ...appPackage }
+  const newAppPackage = { ...application, ...appPackage, url }
   if (appPackage._rev !== application._rev) {
     newAppPackage._rev = application._rev
   }
@@ -437,7 +402,7 @@ const updateAppPackage = async (appPackage, appId) => {
 }
 
 const createEmptyAppPackage = async (ctx, app) => {
-  const db = getAppDB()
+  const db = new CouchDB(app.appId)
 
   let screensAndLayouts = []
   for (let layout of BASE_LAYOUTS) {

package/src/api/controllers/auth.js

@@ -1,10 +1,11 @@
+const CouchDB = require("../../db")
 const { outputProcessing } = require("../../utilities/rowProcessor")
 const { InternalTables } = require("../../db/utils")
 const { getFullUser } = require("../../utilities/users")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 
 exports.fetchSelf = async ctx => {
+  const appId = ctx.appId
   let userId = ctx.user.userId || ctx.user._id
   /* istanbul ignore next */
   if (!userId) {
@@ -15,20 +16,16 @@ exports.fetchSelf = async ctx => {
   const user = await getFullUser(ctx, userId)
   // this shouldn't be returned by the app self
   delete user.roles
-  // forward the csrf token from the session
-  user.csrfToken = ctx.user.csrfToken
 
-  if (getAppId()) {
-    const db = getAppDB()
+  if (appId) {
+    const db = new CouchDB(appId)
     // remove the full roles structure
     delete user.roles
     try {
       const userTable = await db.get(InternalTables.USER_METADATA)
       const metadata = await db.get(userId)
-      // make sure there is never a stale csrf token
-      delete metadata.csrfToken
       // specifically needs to make sure is enriched
-      ctx.body = await outputProcessing(userTable, {
+      ctx.body = await outputProcessing(ctx, userTable, {
         ...user,
         ...metadata,
       })

package/src/api/controllers/automation.js

@@ -1,3 +1,4 @@
+const CouchDB = require("../../db")
 const actions = require("../../automations/actions")
 const triggers = require("../../automations/triggers")
 const { getAutomationParams, generateAutomationID } = require("../../db/utils")
@@ -9,7 +10,6 @@ const {
 const { deleteEntityMetadata } = require("../../utilities")
 const { MetadataTypes } = require("../../constants")
 const { setTestFlag, clearTestFlag } = require("../../utilities/redis")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS)
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
@@ -20,9 +20,14 @@ const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
  *                       *
  *************************/
 
-async function cleanupAutomationMetadata(automationId) {
-  await deleteEntityMetadata(MetadataTypes.AUTOMATION_TEST_INPUT, automationId)
+async function cleanupAutomationMetadata(appId, automationId) {
   await deleteEntityMetadata(
+    appId,
+    MetadataTypes.AUTOMATION_TEST_INPUT,
+    automationId
+  )
+  await deleteEntityMetadata(
+    appId,
     MetadataTypes.AUTOMATION_TEST_HISTORY,
     automationId
   )
@@ -53,7 +58,7 @@ function cleanAutomationInputs(automation) {
 }
 
 exports.create = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   let automation = ctx.request.body
   automation.appId = ctx.appId
 
@@ -67,6 +72,7 @@ exports.create = async function (ctx) {
   automation.type = "automation"
   automation = cleanAutomationInputs(automation)
   automation = await checkForWebhooks({
+    appId: ctx.appId,
     newAuto: automation,
   })
   const response = await db.put(automation)
@@ -83,12 +89,13 @@ exports.create = async function (ctx) {
 }
 
 exports.update = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   let automation = ctx.request.body
   automation.appId = ctx.appId
   const oldAutomation = await db.get(automation._id)
   automation = cleanAutomationInputs(automation)
   automation = await checkForWebhooks({
+    appId: ctx.appId,
     oldAuto: oldAutomation,
     newAuto: automation,
   })
@@ -124,7 +131,7 @@ exports.update = async function (ctx) {
 }
 
 exports.fetch = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const response = await db.allDocs(
     getAutomationParams(null, {
       include_docs: true,
@@ -134,19 +141,20 @@ exports.fetch = async function (ctx) {
 }
 
 exports.find = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   ctx.body = await db.get(ctx.params.id)
 }
 
 exports.destroy = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const automationId = ctx.params.id
   const oldAutomation = await db.get(automationId)
   await checkForWebhooks({
+    appId: ctx.appId,
     oldAuto: oldAutomation,
   })
   // delete metadata first
-  await cleanupAutomationMetadata(automationId)
+  await cleanupAutomationMetadata(ctx.appId, automationId)
   ctx.body = await db.remove(automationId, ctx.params.rev)
 }
 
@@ -172,11 +180,12 @@ module.exports.getDefinitionList = async function (ctx) {
  *********************/
 
 exports.trigger = async function (ctx) {
-  const db = getAppDB()
+  const appId = ctx.appId
+  const db = new CouchDB(appId)
   let automation = await db.get(ctx.params.id)
   await triggers.externalTrigger(automation, {
     ...ctx.request.body,
-    appId: ctx.appId,
+    appId,
   })
   ctx.body = {
     message: `Automation ${automation._id} has been triggered.`,
@@ -196,7 +205,8 @@ function prepareTestInput(input) {
 }
 
 exports.test = async function (ctx) {
-  const db = getAppDB()
+  const appId = ctx.appId
+  const db = new CouchDB(appId)
   let automation = await db.get(ctx.params.id)
   await setTestFlag(automation._id)
   const testInput = prepareTestInput(ctx.request.body)
@@ -204,7 +214,7 @@ exports.test = async function (ctx) {
     automation,
     {
       ...testInput,
-      appId: ctx.appId,
+      appId,
     },
     { getResponses: true }
   )

package/src/api/controllers/cloud.js

@@ -1,5 +1,6 @@
 const env = require("../../environment")
 const { getAllApps } = require("@budibase/backend-core/db")
+const CouchDB = require("../../db")
 const {
   exportDB,
   sendTempFile,
@@ -29,7 +30,7 @@ exports.exportApps = async ctx => {
   if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
     ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
   }
-  const apps = await getAllApps({ all: true })
+  const apps = await getAllApps(CouchDB, { all: true })
   const globalDBString = await exportDB(getGlobalDBName(), {
     filter: doc => !doc._id.startsWith(DocumentTypes.USER),
   })
@@ -62,7 +63,7 @@ async function hasBeenImported() {
   if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
     return true
   }
-  const apps = await getAllApps({ all: true })
+  const apps = await getAllApps(CouchDB, { all: true })
   return apps.length !== 0
 }
 

package/src/api/controllers/component.js

@@ -1,14 +1,15 @@
+const CouchDB = require("../../db")
 const { DocumentTypes } = require("../../db/utils")
 const { getComponentLibraryManifest } = require("../../utilities/fileSystem")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 exports.fetchAppComponentDefinitions = async function (ctx) {
-  const db = getAppDB()
+  const appId = ctx.params.appId || ctx.appId
+  const db = new CouchDB(appId)
   const app = await db.get(DocumentTypes.APP_METADATA)
 
   let componentManifests = await Promise.all(
     app.componentLibraries.map(async library => {
-      let manifest = await getComponentLibraryManifest(library)
+      let manifest = await getComponentLibraryManifest(appId, library)
 
       return {
         manifest,

package/src/api/controllers/datasource.js

@@ -1,3 +1,4 @@
+const CouchDB = require("../../db")
 const {
   generateDatasourceID,
   getDatasourceParams,
@@ -10,11 +11,12 @@ const { BuildSchemaErrors, InvalidColumns } = require("../../constants")
 const { integrations } = require("../../integrations")
 const { getDatasourceAndQuery } = require("./row/utils")
 const { invalidateDynamicVariables } = require("../../threads/utils")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 exports.fetch = async function (ctx) {
+  const database = new CouchDB(ctx.appId)
+
   // Get internal tables
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const internalTables = await db.allDocs(
     getTableParams(null, {
       include_docs: true,
@@ -29,25 +31,18 @@ exports.fetch = async function (ctx) {
 
   // Get external datasources
   const datasources = (
-    await db.allDocs(
+    await database.allDocs(
       getDatasourceParams(null, {
         include_docs: true,
       })
     )
   ).rows.map(row => row.doc)
 
-  for (let datasource of datasources) {
-    if (datasource.config && datasource.config.auth) {
-      // strip secrets from response so they don't show in the network request
-      delete datasource.config.auth
-    }
-  }
-
   ctx.body = [bbInternalDb, ...datasources]
 }
 
 exports.buildSchemaFromDb = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const datasource = await db.get(ctx.params.datasourceId)
 
   const { tables, error } = await buildSchemaHelper(datasource)
@@ -96,16 +91,11 @@ const invalidateVariables = async (existingDatasource, updatedDatasource) => {
 }
 
 exports.update = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const datasourceId = ctx.params.datasourceId
   let datasource = await db.get(datasourceId)
-  const auth = datasource.config.auth
   await invalidateVariables(datasource, ctx.request.body)
   datasource = { ...datasource, ...ctx.request.body }
-  if (auth && !ctx.request.body.auth) {
-    // don't strip auth config from DB
-    datasource.config.auth = auth
-  }
 
   const response = await db.put(datasource)
   datasource._rev = response.rev
@@ -124,7 +114,7 @@ exports.update = async function (ctx) {
 }
 
 exports.save = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const plus = ctx.request.body.datasource.plus
   const fetchSchema = ctx.request.body.fetchSchema
 
@@ -160,7 +150,7 @@ exports.save = async function (ctx) {
 }
 
 exports.destroy = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
 
   // Delete all queries for the datasource
   const queries = await db.allDocs(
@@ -182,7 +172,7 @@ exports.destroy = async function (ctx) {
 }
 
 exports.find = async function (ctx) {
-  const database = getAppDB()
+  const database = new CouchDB(ctx.appId)
   ctx.body = await database.get(ctx.params.datasourceId)
 }
 
@@ -190,7 +180,7 @@ exports.find = async function (ctx) {
 exports.query = async function (ctx) {
   const queryJson = ctx.request.body
   try {
-    ctx.body = await getDatasourceAndQuery(queryJson)
+    ctx.body = await getDatasourceAndQuery(ctx.appId, queryJson)
   } catch (err) {
     ctx.throw(400, err)
   }

package/src/api/controllers/deploy/Deployment.js

@@ -1,14 +1,18 @@
 const newid = require("../../../db/newid")
-const { getAppId } = require("@budibase/backend-core/context")
 
 /**
  * This is used to pass around information about the deployment that is occurring
  */
 class Deployment {
-  constructor(id = null) {
+  constructor(appId, id = null) {
+    this.appId = appId
     this._id = id || newid()
   }
 
+  getAppId() {
+    return this.appId
+  }
+
   setVerification(verification) {
     if (!verification) {
       return
@@ -39,7 +43,7 @@ class Deployment {
   getJSON() {
     const obj = {
       _id: this._id,
-      appId: getAppId(),
+      appId: this.appId,
       status: this.status,
     }
     if (this.err) {