@budibase/server 1.0.49-alpha.9 → 1.0.49

package/src/api/controllers/user.js

@@ -1,3 +1,4 @@
+const CouchDB = require("../../db")
 const {
   generateUserMetadataID,
   getUserMetadataParams,
@@ -10,14 +11,12 @@ const { isEqual } = require("lodash")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const {
   getDevelopmentAppID,
-  getProdAppIDs,
-  dbExists,
+  getDeployedAppIDs,
 } = require("@budibase/backend-core/db")
+const { doesDatabaseExist } = require("../../utilities")
 const { UserStatus } = require("@budibase/backend-core/constants")
-const { getAppDB } = require("@budibase/backend-core/context")
 
-async function rawMetadata() {
-  const db = getAppDB()
+async function rawMetadata(db) {
   return (
     await db.allDocs(
       getUserMetadataParams(null, {
@@ -55,10 +54,13 @@ function combineMetadataAndUser(user, metadata) {
   return null
 }
 
-exports.syncGlobalUsers = async () => {
+exports.syncGlobalUsers = async appId => {
   // sync user metadata
-  const db = getAppDB()
-  const [users, metadata] = await Promise.all([getGlobalUsers(), rawMetadata()])
+  const db = new CouchDB(appId)
+  const [users, metadata] = await Promise.all([
+    getGlobalUsers(appId),
+    rawMetadata(db),
+  ])
   const toWrite = []
   for (let user of users) {
     const combined = await combineMetadataAndUser(user, metadata)
@@ -92,7 +94,7 @@ exports.syncUser = async function (ctx) {
   let prodAppIds
   // if they are a builder then get all production app IDs
   if ((user.builder && user.builder.global) || deleting) {
-    prodAppIds = await getProdAppIDs()
+    prodAppIds = await getDeployedAppIDs(CouchDB)
   } else {
     prodAppIds = Object.entries(roles)
       .filter(entry => entry[1] !== BUILTIN_ROLE_IDS.PUBLIC)
@@ -102,10 +104,10 @@ exports.syncUser = async function (ctx) {
     const roleId = roles[prodAppId]
     const devAppId = getDevelopmentAppID(prodAppId)
     for (let appId of [prodAppId, devAppId]) {
-      if (!(await dbExists(appId))) {
+      if (!(await doesDatabaseExist(appId))) {
         continue
       }
-      const db = getAppDB()
+      const db = new CouchDB(appId)
       const metadataId = generateUserMetadataID(userId)
       let metadata
       try {
@@ -141,8 +143,8 @@ exports.syncUser = async function (ctx) {
 }
 
 exports.fetchMetadata = async function (ctx) {
-  const database = getAppDB()
-  const global = await getGlobalUsers()
+  const database = new CouchDB(ctx.appId)
+  const global = await getGlobalUsers(ctx.appId)
   const metadata = await rawMetadata(database)
   const users = []
   for (let user of global) {
@@ -165,13 +167,12 @@ exports.updateSelfMetadata = async function (ctx) {
   ctx.request.body._id = ctx.user._id
   // make sure no stale rev
   delete ctx.request.body._rev
-  // make sure no csrf token
-  delete ctx.request.body.csrfToken
   await exports.updateMetadata(ctx)
 }
 
 exports.updateMetadata = async function (ctx) {
-  const db = getAppDB()
+  const appId = ctx.appId
+  const db = new CouchDB(appId)
   const user = ctx.request.body
   // this isn't applicable to the user
   delete user.roles
@@ -183,7 +184,7 @@ exports.updateMetadata = async function (ctx) {
 }
 
 exports.destroyMetadata = async function (ctx) {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   try {
     const dbUser = await db.get(ctx.params.id)
     await db.remove(dbUser._id, dbUser._rev)
@@ -206,7 +207,7 @@ exports.setFlag = async function (ctx) {
     ctx.throw(400, "Must supply a 'flag' field in request body.")
   }
   const flagDocId = generateUserFlagID(userId)
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   let doc
   try {
     doc = await db.get(flagDocId)
@@ -221,7 +222,7 @@ exports.setFlag = async function (ctx) {
 exports.getFlags = async function (ctx) {
   const userId = ctx.user._id
   const docId = generateUserFlagID(userId)
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   let doc
   try {
     doc = await db.get(docId)

package/src/api/controllers/view/index.js

@@ -1,3 +1,4 @@
+const CouchDB = require("../../../db")
 const viewTemplate = require("./viewBuilder")
 const { apiFileReturn } = require("../../../utilities/fileSystem")
 const exporters = require("./exporters")
@@ -5,14 +6,14 @@ const { saveView, getView, getViews, deleteView } = require("./utils")
 const { fetchView } = require("../row")
 const { getTable } = require("../table/utils")
 const { FieldTypes } = require("../../../constants")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 exports.fetch = async ctx => {
-  ctx.body = await getViews()
+  const db = new CouchDB(ctx.appId)
+  ctx.body = await getViews(db)
 }
 
 exports.save = async ctx => {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const { originalName, ...viewToSave } = ctx.request.body
   const view = viewTemplate(viewToSave)
 
@@ -20,7 +21,7 @@ exports.save = async ctx => {
     ctx.throw(400, "Cannot create view without a name")
   }
 
-  await saveView(originalName, viewToSave.name, view)
+  await saveView(db, originalName, viewToSave.name, view)
 
   // add views to table document
   const table = await db.get(ctx.request.body.tableId)
@@ -41,9 +42,9 @@ exports.save = async ctx => {
 }
 
 exports.destroy = async ctx => {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const viewName = decodeURI(ctx.params.viewName)
-  const view = await deleteView(viewName)
+  const view = await deleteView(db, viewName)
   const table = await db.get(view.meta.tableId)
   delete table.views[viewName]
   await db.put(table)
@@ -52,8 +53,9 @@ exports.destroy = async ctx => {
 }
 
 exports.exportView = async ctx => {
+  const db = new CouchDB(ctx.appId)
   const viewName = decodeURI(ctx.query.view)
-  const view = await getView(viewName)
+  const view = await getView(db, viewName)
 
   const format = ctx.query.format
   if (!format || !Object.values(exporters.ExportFormats).includes(format)) {
@@ -81,7 +83,7 @@ exports.exportView = async ctx => {
   let schema = view && view.meta && view.meta.schema
   if (!schema) {
     const tableId = ctx.params.tableId || view.meta.tableId
-    const table = await getTable(tableId)
+    const table = await getTable(ctx.appId, tableId)
     schema = table.schema
   }
 

package/src/api/controllers/view/utils.js

@@ -6,10 +6,8 @@ const {
   SEPARATOR,
 } = require("../../../db/utils")
 const env = require("../../../environment")
-const { getAppDB } = require("@budibase/backend-core/context")
 
-exports.getView = async viewName => {
-  const db = getAppDB()
+exports.getView = async (db, viewName) => {
   if (env.SELF_HOSTED) {
     const designDoc = await db.get("_design/database")
     return designDoc.views[viewName]
@@ -24,8 +22,7 @@ exports.getView = async viewName => {
   }
 }
 
-exports.getViews = async () => {
-  const db = getAppDB()
+exports.getViews = async db => {
   const response = []
   if (env.SELF_HOSTED) {
     const designDoc = await db.get("_design/database")
@@ -57,8 +54,7 @@ exports.getViews = async () => {
   return response
 }
 
-exports.saveView = async (originalName, viewName, viewTemplate) => {
-  const db = getAppDB()
+exports.saveView = async (db, originalName, viewName, viewTemplate) => {
   if (env.SELF_HOSTED) {
     const designDoc = await db.get("_design/database")
     designDoc.views = {
@@ -95,8 +91,7 @@ exports.saveView = async (originalName, viewName, viewTemplate) => {
   }
 }
 
-exports.deleteView = async viewName => {
-  const db = getAppDB()
+exports.deleteView = async (db, viewName) => {
   if (env.SELF_HOSTED) {
     const designDoc = await db.get("_design/database")
     const view = designDoc.views[viewName]

package/src/api/controllers/webhook.js

@@ -1,9 +1,9 @@
+const CouchDB = require("../../db")
 const { generateWebhookID, getWebhookParams } = require("../../db/utils")
 const toJsonSchema = require("to-json-schema")
 const validate = require("jsonschema").validate
 const triggers = require("../../automations/triggers")
-const { getProdAppID } = require("@budibase/backend-core/db")
-const { getAppDB, updateAppId } = require("@budibase/backend-core/context")
+const { getDeployedAppID } = require("@budibase/backend-core/db")
 
 const AUTOMATION_DESCRIPTION = "Generated from Webhook Schema"
 
@@ -23,7 +23,7 @@ exports.WebhookType = {
 }
 
 exports.fetch = async ctx => {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const response = await db.allDocs(
     getWebhookParams(null, {
       include_docs: true,
@@ -33,7 +33,7 @@ exports.fetch = async ctx => {
 }
 
 exports.save = async ctx => {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   const webhook = ctx.request.body
   webhook.appId = ctx.appId
 
@@ -52,13 +52,12 @@ exports.save = async ctx => {
 }
 
 exports.destroy = async ctx => {
-  const db = getAppDB()
+  const db = new CouchDB(ctx.appId)
   ctx.body = await db.remove(ctx.params.id, ctx.params.rev)
 }
 
 exports.buildSchema = async ctx => {
-  updateAppId(ctx.params.instance)
-  const db = getAppDB()
+  const db = new CouchDB(ctx.params.instance)
   const webhook = await db.get(ctx.params.id)
   webhook.bodySchema = toJsonSchema(ctx.request.body)
   // update the automation outputs
@@ -82,10 +81,9 @@ exports.buildSchema = async ctx => {
 }
 
 exports.trigger = async ctx => {
-  const prodAppId = getProdAppID(ctx.params.instance)
-  updateAppId(prodAppId)
+  const prodAppId = getDeployedAppID(ctx.params.instance)
   try {
-    const db = getAppDB()
+    const db = new CouchDB(prodAppId)
     const webhook = await db.get(ctx.params.id)
     // validate against the schema
     if (webhook.bodySchema) {

package/src/api/routes/hosting.js

@@ -0,0 +1,13 @@
+const Router = require("@koa/router")
+const controller = require("../controllers/hosting")
+const authorized = require("../../middleware/authorized")
+const { BUILDER } = require("@budibase/backend-core/permissions")
+
+const router = Router()
+
+router
+  .get("/api/hosting/urls", authorized(BUILDER), controller.fetchUrls)
+  // this isn't risky, doesn't return anything about apps other than names and URLs
+  .get("/api/hosting/apps", controller.getDeployedApps)
+
+module.exports = router

package/src/api/routes/index.js

@@ -20,11 +20,11 @@ const integrationRoutes = require("./integration")
 const permissionRoutes = require("./permission")
 const datasourceRoutes = require("./datasource")
 const queryRoutes = require("./query")
+const hostingRoutes = require("./hosting")
 const backupRoutes = require("./backup")
 const metadataRoutes = require("./metadata")
 const devRoutes = require("./dev")
 const cloudRoutes = require("./cloud")
-const migrationRoutes = require("./migrations")
 
 exports.mainRoutes = [
   authRoutes,
@@ -46,6 +46,7 @@ exports.mainRoutes = [
   permissionRoutes,
   datasourceRoutes,
   queryRoutes,
+  hostingRoutes,
   backupRoutes,
   metadataRoutes,
   devRoutes,
@@ -54,7 +55,6 @@ exports.mainRoutes = [
   // this could be breaking as koa may recognise other routes as this
   tableRoutes,
   rowRoutes,
-  migrationRoutes,
 ]
 
 exports.staticRoutes = staticRoutes

package/src/api/routes/static.js

@@ -46,10 +46,5 @@ router
   )
   // TODO: this likely needs to be secured in some way
   .get("/:appId/:path*", controller.serveApp)
-  .post(
-    "/api/attachments/:datasourceId/url",
-    authorized(PermissionTypes.TABLE, PermissionLevels.READ),
-    controller.getSignedUploadURL
-  )
 
 module.exports = router

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

@@ -53,8 +53,8 @@ describe("/applications", () => {
 
   describe("fetch", () => {
     it("lists all applications", async () => {
-      await config.createApp("app1")
-      await config.createApp("app2")
+      await config.createApp(request, "app1")
+      await config.createApp(request, "app2")
 
       const res = await request
         .get(`/api/applications?status=${AppStatus.DEV}`)

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

@@ -13,9 +13,10 @@ describe("/authenticate", () => {
 
   describe("fetch self", () => {
     it("should be able to fetch self", async () => {
+      const headers = await config.login()
       const res = await request
         .get(`/api/self`)
-        .set(config.defaultHeaders())
+        .set(headers)
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body._id).toEqual(generateUserMetadataID("us_uuid1"))

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

@@ -145,7 +145,6 @@ describe("/automations", () => {
       let table = await config.createTable()
       automation.definition.trigger.inputs.tableId = table._id
       automation.definition.steps[0].inputs.row.tableId = table._id
-      automation.appId = config.appId
       automation = await config.createAutomation(automation)
       await setup.delay(500)
       const res = await testAutomation(config, automation)

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

@@ -0,0 +1,36 @@
+// mock out node fetch for this
+jest.mock("node-fetch")
+
+const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
+const setup = require("./utilities")
+
+describe("/hosting", () => {
+  let request = setup.getRequest()
+  let config = setup.getConfig()
+  let app
+
+  afterAll(setup.afterAll)
+
+  beforeEach(async () => {
+    app = await config.init()
+  })
+
+  describe("fetchUrls", () => {
+    it("should be able to fetch current app URLs", async () => {
+      const res = await request
+        .get(`/api/hosting/urls`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+      expect(res.body.app).toEqual(`http://localhost:10000/app`)
+    })
+
+    it("should apply authorization to endpoint", async () => {
+      await checkBuilderEndpoint({
+        config,
+        method: "GET",
+        url: `/api/hosting/urls`,
+      })
+    })
+  })
+})

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

@@ -82,6 +82,7 @@ describe("run misc tests", () => {
         dataImport.schema[col] = { type: "string" }
       }
       await tableUtils.handleDataImport(
+        config.getAppId(),
         { userId: "test" },
         table,
         dataImport

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

@@ -1,15 +1,10 @@
 const setup = require("./utilities")
 const { basicScreen } = setup.structures
-const { checkBuilderEndpoint, runInProd } = require("./utilities/TestFunctions")
+const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { doInAppContext } = require("@budibase/backend-core/context")
 
 const route = "/test"
 
-// there are checks which are disabled in test env,
-// these checks need to be enabled for this test
-
-
 describe("/routing", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
@@ -31,24 +26,20 @@ describe("/routing", () => {
 
   describe("fetch", () => {
     it("prevents a public user from accessing development app", async () => {
-      await runInProd(() => {
-        return request
-          .get(`/api/routing/client`)
-          .set(config.publicHeaders({ prodApp: false }))
-          .expect(302)
-      })
+      await request
+        .get(`/api/routing/client`)
+        .set(config.publicHeaders({ prodApp: false }))
+        .expect(302)
     })
 
     it("prevents a non builder from accessing development app", async () => {
-      await runInProd(async () => {
-        return request
-          .get(`/api/routing/client`)
-          .set(await config.roleHeaders({
-            roleId: BUILTIN_ROLE_IDS.BASIC,
-            prodApp: false
-          }))
-          .expect(302)
-      })
+      await request
+        .get(`/api/routing/client`)
+        .set(await config.roleHeaders({
+          roleId: BUILTIN_ROLE_IDS.BASIC,
+          prodApp: false
+        }))
+        .expect(302)
     })
     it("returns the correct routing for basic user", async () => {
       const res = await request

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

@@ -1,7 +1,6 @@
 const { outputProcessing } = require("../../../utilities/rowProcessor")
 const setup = require("./utilities")
 const { basicRow } = setup.structures
-const { doInAppContext } = require("@budibase/backend-core/context")
 
 // mock the fetch for the search system
 jest.mock("node-fetch")
@@ -388,12 +387,10 @@ describe("/rows", () => {
       })
       // the environment needs configured for this
       await setup.switchToSelfHosted(async () => {
-        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`
-          )
-        })
+        const enriched = await outputProcessing({ appId: config.getAppId() }, table, [row])
+        expect(enriched[0].attachment[0].url).toBe(
+          `/prod-budi-app-assets/${config.getAppId()}/attachments/test/thing.csv`
+        )
       })
     })
   })

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

@@ -1,10 +1,9 @@
 const rowController = require("../../../controllers/row")
 const appController = require("../../../controllers/application")
+const CouchDB = require("../../../../db")
 const { AppStatus } = require("../../../../db/utils")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { TENANT_ID } = require("../../../../tests/utilities/structures")
-const { getAppDB, doInAppContext } = require("@budibase/backend-core/context")
-const env = require("../../../../environment")
 
 function Request(appId, params) {
   this.appId = appId
@@ -12,15 +11,9 @@ function Request(appId, params) {
   this.request = {}
 }
 
-function runRequest(appId, controlFunc, request) {
-  return doInAppContext(appId, async () => {
-    return controlFunc(request)
-  })
-}
-
 exports.getAllTableRows = async config => {
   const req = new Request(config.appId, { tableId: config.table._id })
-  await runRequest(config.appId, rowController.fetch, req)
+  await rowController.fetch(req)
   return req.body
 }
 
@@ -33,17 +26,14 @@ exports.clearAllApps = async (tenantId = TENANT_ID) => {
   }
   for (let app of apps) {
     const { appId } = app
-    const req = new Request(null, { appId })
-    await runRequest(appId, appController.delete, req)
+    await appController.delete(new Request(null, { appId }))
   }
 }
 
 exports.clearAllAutomations = async config => {
   const automations = await config.getAllAutomations()
   for (let auto of automations) {
-    await doInAppContext(config.appId, async () => {
-      await config.deleteAutomation(auto)
-    })
+    await config.deleteAutomation(auto)
   }
 }
 
@@ -106,32 +96,20 @@ exports.checkPermissionsEndpoint = async ({
     .expect(403)
 }
 
-exports.getDB = () => {
-  return getAppDB()
+exports.getDB = config => {
+  return new CouchDB(config.getAppId())
 }
 
 exports.testAutomation = async (config, automation) => {
-  return runRequest(automation.appId, async () => {
-    return await config.request
-      .post(`/api/automations/${automation._id}/test`)
-      .send({
-        row: {
-          name: "Test",
-          description: "TEST",
-        },
-      })
-      .set(config.defaultHeaders())
-      .expect("Content-Type", /json/)
-      .expect(200)
-  })
-}
-
-exports.runInProd = async func => {
-  const nodeEnv = env.NODE_ENV
-  const workerId = env.JEST_WORKER_ID
-  env._set("NODE_ENV", "PRODUCTION")
-  env._set("JEST_WORKER_ID", null)
-  await func()
-  env._set("NODE_ENV", nodeEnv)
-  env._set("JEST_WORKER_ID", workerId)
+  return await config.request
+    .post(`/api/automations/${automation._id}/test`)
+    .send({
+      row: {
+        name: "Test",
+        description: "TEST",
+      },
+    })
+    .set(config.defaultHeaders())
+    .expect("Content-Type", /json/)
+    .expect(200)
 }

package/src/app.ts

@@ -1,7 +1,7 @@
 // need to load environment first
 import { ExtendableContext } from "koa"
 
-import * as env from "./environment"
+const env = require("./environment")
 const CouchDB = require("./db")
 require("@budibase/backend-core").init(CouchDB)
 const Koa = require("koa")
@@ -16,7 +16,6 @@ const Sentry = require("@sentry/node")
 const fileSystem = require("./utilities/fileSystem")
 const bullboard = require("./automations/bullboard")
 const redis = require("./utilities/redis")
-import * as migrations from "./migrations"
 
 const app = new Koa()
 
@@ -85,25 +84,13 @@ module.exports = server.listen(env.PORT || 0, async () => {
   await automations.init()
 })
 
-const shutdown = () => {
-  server.close()
-  server.destroy()
-}
-
 process.on("uncaughtException", err => {
   console.error(err)
-  shutdown()
+  server.close()
+  server.destroy()
 })
 
 process.on("SIGTERM", () => {
-  shutdown()
+  server.close()
+  server.destroy()
 })
-
-// run migrations on startup if not done via http
-// not recommended in a clustered environment
-if (!env.HTTP_MIGRATIONS) {
-  migrations.migrate().catch(err => {
-    console.error("Error performing migrations. Exiting.\n", err)
-    shutdown()
-  })
-}

package/src/automations/automationUtils.js

@@ -53,12 +53,13 @@ exports.cleanInputValues = (inputs, schema) => {
  * the automation but is instead part of the Table/Table. This function will get the table schema and use it to instead
  * perform the cleanInputValues function on the input row.
  *
+ * @param {string} appId The instance which the Table/Table is contained under.
  * @param {string} tableId The ID of the Table/Table which the schema is to be retrieved for.
  * @param {object} row The input row structure which requires clean-up after having been through template statements.
  * @returns {Promise<Object>} The cleaned up rows object, will should now have all the required primitive types.
  */
-exports.cleanUpRow = async (tableId, row) => {
-  let table = await getTable(tableId)
+exports.cleanUpRow = async (appId, tableId, row) => {
+  let table = await getTable(appId, tableId)
   return exports.cleanInputValues(row, { properties: table.schema })
 }
 

package/src/automations/steps/createRow.js

@@ -1,5 +1,6 @@
 const rowController = require("../../api/controllers/row")
 const automationUtils = require("../automationUtils")
+const env = require("../../environment")
 const usage = require("../../utilities/usageQuota")
 const { buildCtx } = require("./utils")
 
@@ -78,12 +79,14 @@ exports.run = async function ({ inputs, appId, emitter }) {
 
   try {
     inputs.row = await automationUtils.cleanUpRow(
+      appId,
       inputs.row.tableId,
       inputs.row
     )
-    await usage.update(usage.Properties.ROW, 1, { dryRun: true })
+    if (env.USE_QUOTAS) {
+      await usage.update(usage.Properties.ROW, 1)
+    }
     await rowController.save(ctx)
-    await usage.update(usage.Properties.ROW, 1)
     return {
       row: inputs.row,
       response: ctx.body,