@budibase/server 1.0.49-alpha.9 → 1.0.49

package/src/middleware/tests/currentapp.spec.js

@@ -1,11 +1,6 @@
 mockAuthWithNoCookie()
 mockWorker()
 
-jest.mock("@budibase/backend-core/db", () => ({
-  ...jest.requireActual("@budibase/backend-core/db"),
-  dbExists: () => true,
-}))
-
 function mockWorker() {
   jest.mock("../../utilities/workerRequests", () => ({
     getGlobalSelf: () => {
@@ -55,7 +50,6 @@ function mockAuthWithCookie() {
       return "app_test"
     },
     setCookie: jest.fn(),
-    clearCookie: jest.fn(),
     getCookie: () => ({appId: "app_different", roleId: "PUBLIC"}),
   }))
   jest.mock("@budibase/backend-core/constants", () => ({

package/src/middleware/tests/usageQuota.spec.js

@@ -1,5 +1,11 @@
 jest.mock("../../db")
 jest.mock("../../utilities/usageQuota")
+jest.mock("../../environment", () => ({
+  isTest: () => true,
+  isProd: () => false,
+  isDev: () => true,
+  _set: () => {},
+}))
 jest.mock("@budibase/backend-core/tenancy", () => ({
   getTenantId: () => "testing123"
 }))
@@ -23,10 +29,9 @@ class TestConfiguration {
       },
       req: {
         method: "POST",
-        url: "/applications"
+        url: "/rows"
       }
     }
-    usageQuota.useQuotas = () => true
   }
 
   executeMiddleware() {
@@ -108,6 +113,7 @@ describe("usageQuota middleware", () => {
 
   it("calculates and persists the correct usage quota for the relevant action", async () => {
     config.setUrl("/rows")
+    config.setProd(true)
 
     await config.executeMiddleware()
 
@@ -115,20 +121,20 @@ describe("usageQuota middleware", () => {
     expect(config.next).toHaveBeenCalled()
   })
 
-  // it("calculates the correct file size from a file upload call and adds it to quota", async () => {
-  //   config.setUrl("/upload")
-  //   config.setProd(true)
-  //   config.setFiles([
-  //     {
-  //       size: 100
-  //     },
-  //     {
-  //       size: 10000
-  //     },
-  //   ])
-  //   await config.executeMiddleware()
-
-  //   expect(usageQuota.update).toHaveBeenCalledWith("storage", 10100)
-  //   expect(config.next).toHaveBeenCalled()
-  // })
+  it("calculates the correct file size from a file upload call and adds it to quota", async () => {
+    config.setUrl("/upload")
+    config.setProd(true)
+    config.setFiles([
+      {
+        size: 100
+      },
+      {
+        size: 10000
+      },
+    ])
+    await config.executeMiddleware()
+
+    expect(usageQuota.update).toHaveBeenCalledWith("storage", 10100)
+    expect(config.next).toHaveBeenCalled()
+  })
 })

package/src/middleware/usageQuota.js

@@ -1,10 +1,14 @@
+const CouchDB = require("../db")
 const usageQuota = require("../utilities/usageQuota")
-const { getUniqueRows } = require("../utilities/usageQuota/rows")
+const env = require("../environment")
+const { getTenantId } = require("@budibase/backend-core/tenancy")
 const {
   isExternalTable,
   isRowId: isExternalRowId,
 } = require("../integrations/utils")
-const { getAppDB } = require("@budibase/backend-core/context")
+
+// tenants without limits
+const EXCLUDED_TENANTS = ["bb", "default", "bbtest", "bbstaging"]
 
 // currently only counting new writes and deletes
 const METHOD_MAP = {
@@ -14,13 +18,13 @@ const METHOD_MAP = {
 
 const DOMAIN_MAP = {
   rows: usageQuota.Properties.ROW,
-  // upload: usageQuota.Properties.UPLOAD,            // doesn't work yet
-  // views: usageQuota.Properties.VIEW,               // doesn't work yet
-  // users: usageQuota.Properties.USER,               // doesn't work yet
+  upload: usageQuota.Properties.UPLOAD,
+  views: usageQuota.Properties.VIEW,
+  users: usageQuota.Properties.USER,
   applications: usageQuota.Properties.APPS,
   // this will not be updated by endpoint calls
   // instead it will be updated by triggerInfo
-  // automationRuns: usageQuota.Properties.AUTOMATION, // doesn't work yet
+  automationRuns: usageQuota.Properties.AUTOMATION,
 }
 
 function getProperty(url) {
@@ -32,7 +36,10 @@ function getProperty(url) {
 }
 
 module.exports = async (ctx, next) => {
-  if (!usageQuota.useQuotas()) {
+  const tenantId = getTenantId()
+
+  // if in development or a self hosted cloud usage quotas should not be executed
+  if (env.isDev() || env.SELF_HOSTED || EXCLUDED_TENANTS.includes(tenantId)) {
     return next()
   }
 
@@ -46,7 +53,7 @@ module.exports = async (ctx, next) => {
     const usageId = ctx.request.body._id
     try {
       if (ctx.appId) {
-        const db = getAppDB()
+        const db = new CouchDB(ctx.appId)
         await db.get(usageId)
       }
       return next()
@@ -73,92 +80,9 @@ module.exports = async (ctx, next) => {
     usage = files.map(file => file.size).reduce((total, size) => total + size)
   }
   try {
-    await performRequest(ctx, next, property, usage)
+    await usageQuota.update(property, usage)
+    return next()
   } catch (err) {
     ctx.throw(400, err)
   }
 }
-
-const performRequest = async (ctx, next, property, usage) => {
-  const usageContext = {
-    skipNext: false,
-    skipUsage: false,
-    [usageQuota.Properties.APPS]: {},
-  }
-
-  if (usage === -1) {
-    if (PRE_DELETE[property]) {
-      await PRE_DELETE[property](ctx, usageContext)
-    }
-  } else {
-    if (PRE_CREATE[property]) {
-      await PRE_CREATE[property](ctx, usageContext)
-    }
-  }
-
-  // run the request
-  if (!usageContext.skipNext) {
-    await usageQuota.update(property, usage, { dryRun: true })
-    await next()
-  }
-
-  if (usage === -1) {
-    if (POST_DELETE[property]) {
-      await POST_DELETE[property](ctx, usageContext)
-    }
-  } else {
-    if (POST_CREATE[property]) {
-      await POST_CREATE[property](ctx, usageContext)
-    }
-  }
-
-  // update the usage
-  if (!usageContext.skipUsage) {
-    await usageQuota.update(property, usage)
-  }
-}
-
-const appPreDelete = async (ctx, usageContext) => {
-  if (ctx.query.unpublish) {
-    // don't run usage decrement for unpublish
-    usageContext.skipUsage = true
-    return
-  }
-
-  // store the row count to delete
-  const rows = await getUniqueRows([ctx.appId])
-  if (rows.length) {
-    usageContext[usageQuota.Properties.APPS] = { rowCount: rows.length }
-  }
-}
-
-const appPostDelete = async (ctx, usageContext) => {
-  // delete the app rows from usage
-  const rowCount = usageContext[usageQuota.Properties.APPS].rowCount
-  if (rowCount) {
-    await usageQuota.update(usageQuota.Properties.ROW, -rowCount)
-  }
-}
-
-const appPostCreate = async ctx => {
-  // app import & template creation
-  if (ctx.request.body.useTemplate === "true") {
-    const rows = await getUniqueRows([ctx.response.body.appId])
-    const rowCount = rows ? rows.length : 0
-    await usageQuota.update(usageQuota.Properties.ROW, rowCount)
-  }
-}
-
-const PRE_DELETE = {
-  [usageQuota.Properties.APPS]: appPreDelete,
-}
-
-const POST_DELETE = {
-  [usageQuota.Properties.APPS]: appPostDelete,
-}
-
-const PRE_CREATE = {}
-
-const POST_CREATE = {
-  [usageQuota.Properties.APPS]: appPostCreate,
-}

package/src/tests/utilities/TestConfiguration.js

@@ -1,6 +1,3 @@
-const core = require("@budibase/backend-core")
-const CouchDB = require("../../db")
-core.init(CouchDB)
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const env = require("../../environment")
 const {
@@ -20,15 +17,15 @@ const supertest = require("supertest")
 const { cleanup } = require("../../utilities/fileSystem")
 const { Cookies, Headers } = require("@budibase/backend-core/constants")
 const { jwt } = require("@budibase/backend-core/auth")
+const core = require("@budibase/backend-core")
 const { getGlobalDB } = require("@budibase/backend-core/tenancy")
 const { createASession } = require("@budibase/backend-core/sessions")
 const { user: userCache } = require("@budibase/backend-core/cache")
-const newid = require("../../db/newid")
-const context = require("@budibase/backend-core/context")
+const CouchDB = require("../../db")
+core.init(CouchDB)
 
 const GLOBAL_USER_ID = "us_uuid1"
 const EMAIL = "babs@babs.com"
-const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 class TestConfiguration {
   constructor(openServer = true) {
@@ -51,10 +48,6 @@ class TestConfiguration {
     return this.appId
   }
 
-  getCouch() {
-    return CouchDB
-  }
-
   async _req(config, params, controlFunc) {
     const request = {}
     // fake cookies, we don't need them
@@ -66,21 +59,11 @@ class TestConfiguration {
     request.request = {
       body: config,
     }
-    async function run() {
-      if (params) {
-        request.params = params
-      }
-      await controlFunc(request)
-      return request.body
-    }
-    // check if already in a context
-    if (context.getAppId() == null) {
-      return context.doInAppContext(this.appId, async () => {
-        return run()
-      })
-    } else {
-      return run()
+    if (params) {
+      request.params = params
     }
+    await controlFunc(request)
+    return request.body
   }
 
   async globalUser({
@@ -102,11 +85,7 @@ class TestConfiguration {
       roles: roles || {},
       tenantId: TENANT_ID,
     }
-    await createASession(id, {
-      sessionId: "sessionid",
-      tenantId: TENANT_ID,
-      csrfToken: CSRF_TOKEN,
-    })
+    await createASession(id, { sessionId: "sessionid", tenantId: TENANT_ID })
     if (builder) {
       user.builder = { global: true }
     } else {
@@ -119,8 +98,7 @@ class TestConfiguration {
     }
   }
 
-  // use a new id as the name to avoid name collisions
-  async init(appName = newid()) {
+  async init(appName = "test_application") {
     await this.globalUser()
     return this.createApp(appName)
   }
@@ -153,7 +131,6 @@ class TestConfiguration {
         `${Cookies.Auth}=${authToken}`,
         `${Cookies.CurrentApp}=${appToken}`,
       ],
-      [Headers.CSRF_TOKEN]: CSRF_TOKEN,
     }
     if (this.appId) {
       headers[Headers.APP_ID] = this.appId
@@ -186,7 +163,6 @@ class TestConfiguration {
     // create dev app
     this.app = await this._req({ name: appName }, null, controllers.app.create)
     this.appId = this.app.appId
-    context.updateAppId(this.appId)
 
     // create production app
     this.prodApp = await this.deploy()
@@ -199,16 +175,14 @@ class TestConfiguration {
   }
 
   async deploy() {
-    await this._req(null, null, controllers.deploy.deployApp)
-    const prodAppId = this.getAppId().replace("_dev", "")
-    return context.doInAppContext(prodAppId, async () => {
-      const appPackage = await this._req(
-        null,
-        { appId: prodAppId },
-        controllers.app.fetchAppPackage
-      )
-      return appPackage.application
-    })
+    const deployment = await this._req(null, null, controllers.deploy.deployApp)
+    const prodAppId = deployment.appId.replace("_dev", "")
+    const appPackage = await this._req(
+      null,
+      { appId: prodAppId },
+      controllers.app.fetchAppPackage
+    )
+    return appPackage.application
   }
 
   async updateTable(config = null) {
@@ -437,47 +411,46 @@ class TestConfiguration {
 
   async login({ roleId, userId, builder, prodApp = false } = {}) {
     const appId = prodApp ? this.prodAppId : this.appId
-    return context.doInAppContext(appId, async () => {
-      userId = !userId ? `us_uuid1` : userId
-      if (!this.request) {
-        throw "Server has not been opened, cannot login."
-      }
-      // make sure the user exists in the global DB
-      if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
-        await this.globalUser({
-          id: userId,
-          builder,
-          roles: { [this.prodAppId]: roleId },
-        })
-      }
-      await createASession(userId, {
-        sessionId: "sessionid",
-        tenantId: TENANT_ID,
-      })
-      // have to fake this
-      const auth = {
+
+    userId = !userId ? `us_uuid1` : userId
+    if (!this.request) {
+      throw "Server has not been opened, cannot login."
+    }
+    // make sure the user exists in the global DB
+    if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
+      await this.globalUser({
         userId,
-        sessionId: "sessionid",
-        tenantId: TENANT_ID,
-      }
-      const app = {
-        roleId: roleId,
-        appId,
-      }
-      const authToken = jwt.sign(auth, env.JWT_SECRET)
-      const appToken = jwt.sign(app, env.JWT_SECRET)
-
-      // returning necessary request headers
-      await userCache.invalidateUser(userId)
-      return {
-        Accept: "application/json",
-        Cookie: [
-          `${Cookies.Auth}=${authToken}`,
-          `${Cookies.CurrentApp}=${appToken}`,
-        ],
-        [Headers.APP_ID]: appId,
-      }
+        builder,
+        roles: { [this.prodAppId]: roleId },
+      })
+    }
+    await createASession(userId, {
+      sessionId: "sessionid",
+      tenantId: TENANT_ID,
     })
+    // have to fake this
+    const auth = {
+      userId,
+      sessionId: "sessionid",
+      tenantId: TENANT_ID,
+    }
+    const app = {
+      roleId: roleId,
+      appId,
+    }
+    const authToken = jwt.sign(auth, env.JWT_SECRET)
+    const appToken = jwt.sign(app, env.JWT_SECRET)
+
+    // returning necessary request headers
+    await userCache.invalidateUser(userId)
+    return {
+      Accept: "application/json",
+      Cookie: [
+        `${Cookies.Auth}=${authToken}`,
+        `${Cookies.CurrentApp}=${appToken}`,
+      ],
+      [Headers.APP_ID]: appId,
+    }
   }
 }
 

package/src/threads/automation.js

@@ -5,11 +5,11 @@ const automationUtils = require("../automations/automationUtils")
 const AutomationEmitter = require("../events/AutomationEmitter")
 const { processObject } = require("@budibase/string-templates")
 const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants")
+const CouchDB = require("../db")
 const { DocumentTypes, isDevAppID } = require("../db/utils")
 const { doInTenant } = require("@budibase/backend-core/tenancy")
 const usage = require("../utilities/usageQuota")
 const { definitions: triggerDefs } = require("../automations/triggerInfo")
-const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId
 const CRON_STEP_ID = triggerDefs.CRON.stepId
@@ -59,10 +59,11 @@ class Orchestrator {
   }
 
   async getApp() {
+    const appId = this._appId
     if (this._app) {
       return this._app
     }
-    const db = getAppDB()
+    const db = new CouchDB(appId)
     this._app = await db.get(DocumentTypes.APP_METADATA)
     return this._app
   }
@@ -130,19 +131,16 @@ class Orchestrator {
 }
 
 module.exports = (input, callback) => {
-  const appId = input.data.event.appId
-  doInAppContext(appId, () => {
-    const automationOrchestrator = new Orchestrator(
-      input.data.automation,
-      input.data.event
-    )
-    automationOrchestrator
-      .execute()
-      .then(response => {
-        callback(null, response)
-      })
-      .catch(err => {
-        callback(err)
-      })
-  })
+  const automationOrchestrator = new Orchestrator(
+    input.data.automation,
+    input.data.event
+  )
+  automationOrchestrator
+    .execute()
+    .then(response => {
+      callback(null, response)
+    })
+    .catch(err => {
+      callback(err)
+    })
 }

package/src/threads/query.js

@@ -3,10 +3,11 @@ threadUtils.threadSetup()
 const ScriptRunner = require("../utilities/scriptRunner")
 const { integrations } = require("../integrations")
 const { processStringSync } = require("@budibase/string-templates")
-const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
+const CouchDB = require("../db")
 
 class QueryRunner {
   constructor(input, flags = { noRecursiveQuery: false }) {
+    this.appId = input.appId
     this.datasource = input.datasource
     this.queryVerb = input.queryVerb
     this.fields = input.fields
@@ -74,11 +75,6 @@ class QueryRunner {
       return this.execute()
     }
 
-    // check for undefined response
-    if (!rows) {
-      rows = []
-    }
-
     // needs to an array for next step
     if (!Array.isArray(rows)) {
       rows = [rows]
@@ -100,11 +96,12 @@ class QueryRunner {
   }
 
   async runAnotherQuery(queryId, parameters) {
-    const db = getAppDB()
+    const db = new CouchDB(this.appId)
     const query = await db.get(queryId)
     const datasource = await db.get(query.datasourceId)
     return new QueryRunner(
       {
+        appId: this.appId,
         datasource,
         queryVerb: query.queryVerb,
         fields: query.fields,
@@ -214,14 +211,12 @@ class QueryRunner {
 }
 
 module.exports = (input, callback) => {
-  doInAppContext(input.appId, () => {
-    const Runner = new QueryRunner(input)
-    Runner.execute()
-      .then(response => {
-        callback(null, response)
-      })
-      .catch(err => {
-        callback(err)
-      })
-  })
+  const Runner = new QueryRunner(input)
+  Runner.execute()
+    .then(response => {
+      callback(null, response)
+    })
+    .catch(err => {
+      callback(err)
+    })
 }

package/src/utilities/fileSystem/index.js

@@ -1,4 +1,5 @@
 const { budibaseTempDir } = require("../budibaseDir")
+const { isDev } = require("../index")
 const fs = require("fs")
 const { join } = require("path")
 const uuid = require("uuid/v4")
@@ -19,7 +20,6 @@ const {
   LINK_USER_METADATA_PREFIX,
 } = require("../../db/utils")
 const MemoryStream = require("memorystream")
-const { getAppId } = require("@budibase/backend-core/context")
 
 const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..")
 const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules")
@@ -51,7 +51,7 @@ exports.init = () => {
  * everything required to function is ready.
  */
 exports.checkDevelopmentEnvironment = () => {
-  if (!env.isDev() || env.isTest()) {
+  if (!isDev()) {
     return
   }
   if (!fs.existsSync(budibaseTempDir())) {
@@ -251,8 +251,7 @@ exports.downloadTemplate = async (type, name) => {
 /**
  * Retrieves component libraries from object store (or tmp symlink if in local)
  */
-exports.getComponentLibraryManifest = async library => {
-  const appId = getAppId()
+exports.getComponentLibraryManifest = async (appId, library) => {
   const filename = "manifest.json"
   /* istanbul ignore next */
   // when testing in cypress and so on we need to get the package

package/src/utilities/global.js

@@ -3,7 +3,7 @@ const {
   getGlobalIDFromUserMetadataID,
 } = require("../db/utils")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { getProdAppID } = require("@budibase/backend-core/db")
+const { getDeployedAppID } = require("@budibase/backend-core/db")
 const { getGlobalUserParams } = require("@budibase/backend-core/db")
 const { user: userCache } = require("@budibase/backend-core/cache")
 const {
@@ -11,10 +11,8 @@ const {
   isUserInAppTenant,
 } = require("@budibase/backend-core/tenancy")
 const env = require("../environment")
-const { getAppId } = require("@budibase/backend-core/context")
 
-exports.updateAppRole = (user, { appId } = {}) => {
-  appId = appId || getAppId()
+exports.updateAppRole = (appId, user) => {
   if (!user || !user.roles) {
     return user
   }
@@ -26,7 +24,7 @@ exports.updateAppRole = (user, { appId } = {}) => {
     return user
   }
   // always use the deployed app
-  user.roleId = user.roles[getProdAppID(appId)]
+  user.roleId = user.roles[getDeployedAppID(appId)]
   // if a role wasn't found then either set as admin (builder) or public (everyone else)
   if (!user.roleId && user.builder && user.builder.global) {
     user.roleId = BUILTIN_ROLE_IDS.ADMIN
@@ -37,18 +35,18 @@ exports.updateAppRole = (user, { appId } = {}) => {
   return user
 }
 
-function processUser(user, { appId } = {}) {
+function processUser(appId, user) {
   if (user) {
     delete user.password
   }
-  return exports.updateAppRole(user, { appId })
+  return exports.updateAppRole(appId, user)
 }
 
 exports.getCachedSelf = async (ctx, appId) => {
   // this has to be tenant aware, can't depend on the context to find it out
   // running some middlewares before the tenancy causes context to break
   const user = await userCache.getUser(ctx.user._id)
-  return processUser(user, { appId })
+  return processUser(appId, user)
 }
 
 exports.getRawGlobalUser = async userId => {
@@ -56,13 +54,12 @@ exports.getRawGlobalUser = async userId => {
   return db.get(getGlobalIDFromUserMetadataID(userId))
 }
 
-exports.getGlobalUser = async userId => {
+exports.getGlobalUser = async (appId, userId) => {
   let user = await exports.getRawGlobalUser(userId)
-  return processUser(user)
+  return processUser(appId, user)
 }
 
-exports.getGlobalUsers = async (users = null) => {
-  const appId = getAppId()
+exports.getGlobalUsers = async (appId = null, users = null) => {
   const db = getGlobalDB()
   let globalUsers
   if (users) {
@@ -89,11 +86,11 @@ exports.getGlobalUsers = async (users = null) => {
   if (!appId) {
     return globalUsers
   }
-  return globalUsers.map(user => exports.updateAppRole(user))
+  return globalUsers.map(user => exports.updateAppRole(appId, user))
 }
 
-exports.getGlobalUsersFromMetadata = async users => {
-  const globalUsers = await exports.getGlobalUsers(users)
+exports.getGlobalUsersFromMetadata = async (appId, users) => {
+  const globalUsers = await exports.getGlobalUsers(appId, users)
   return users.map(user => {
     const globalUser = globalUsers.find(
       globalUser => globalUser && user._id.includes(globalUser._id)