@budibase/server 1.0.123-alpha.0 → 1.0.123

package/dist/utilities/usageQuota/index.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const env = require("../../environment");
+const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy");
+const { StaticDatabases, generateNewUsageQuotaDoc, } = require("@budibase/backend-core/db");
+exports.useQuotas = () => {
+    // check if quotas are enabled
+    if (env.USE_QUOTAS) {
+        // check if there are any tenants without limits
+        if (env.EXCLUDE_QUOTAS_TENANTS) {
+            const excludedTenants = env.EXCLUDE_QUOTAS_TENANTS.replace(/\s/g, "").split(",");
+            const tenantId = getTenantId();
+            if (excludedTenants.includes(tenantId)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return false;
+};
+exports.Properties = {
+    ROW: "rows",
+    UPLOAD: "storage",
+    VIEW: "views",
+    USER: "users",
+    AUTOMATION: "automationRuns",
+    APPS: "apps",
+    EMAILS: "emails", // doesn't work yet
+};
+exports.getUsageQuotaDoc = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    let quota;
+    try {
+        quota = yield db.get(StaticDatabases.GLOBAL.docs.usageQuota);
+    }
+    catch (err) {
+        // doc doesn't exist. Create it
+        quota = generateNewUsageQuotaDoc();
+        const response = yield db.put(quota);
+        quota._rev = response.rev;
+    }
+    return quota;
+});
+/**
+ * Given a specified tenantId this will add to the usage object for the specified property.
+ * @param {string} property The property which is to be added to (within the nested usageQuota object).
+ * @param {number} usage The amount (this can be negative) to adjust the number by.
+ * @param {object} opts optional - options such as dryRun, to check what update will do.
+ * @returns {Promise<void>} When this completes the API key will now be up to date - the quota period may have
+ * also been reset after this call.
+ */
+exports.update = (property, usage, opts = { dryRun: false }) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!exports.useQuotas()) {
+        return;
+    }
+    try {
+        const db = getGlobalDB();
+        const quota = yield exports.getUsageQuotaDoc(db);
+        // increment the quota
+        quota.usageQuota[property] += usage;
+        if (quota.usageQuota[property] > quota.usageLimits[property] &&
+            usage > 0 // allow for decrementing usage when the quota is already exceeded
+        ) {
+            throw new Error(`You have exceeded your usage quota of ${quota.usageLimits[property]} ${property}.`);
+        }
+        if (quota.usageQuota[property] < 0) {
+            // never go negative if the quota has previously been exceeded
+            quota.usageQuota[property] = 0;
+        }
+        // update the usage quotas
+        if (!opts.dryRun) {
+            yield db.put(quota);
+        }
+    }
+    catch (err) {
+        console.error(`Error updating usage quotas for ${property}`, err);
+        throw err;
+    }
+});

package/nodemon.json

@@ -1,5 +1,5 @@
 {
-  "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"],
+  "watch": ["src", "../backend-core"],
   "ext": "js,ts,json",
   "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js"],
   "exec": "ts-node src/index.ts"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.123-alpha.0",
+  "version": "1.0.123",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -9,7 +9,7 @@
     "url": "https://github.com/Budibase/budibase.git"
   },
   "scripts": {
-    "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
+    "build": "rimraf dist/ && tsc && mv dist/src/* dist/ && rmdir dist/src/ && yarn postbuild",
     "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
     "test": "jest --coverage --maxWorkers=2",
     "test:watch": "jest --watch",
@@ -68,19 +68,16 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.123-alpha.0",
-    "@budibase/client": "^1.0.123-alpha.0",
-    "@budibase/pro": "1.0.105-alpha.43",
-    "@budibase/string-templates": "^1.0.123-alpha.0",
+    "@budibase/backend-core": "^1.0.123",
+    "@budibase/client": "^1.0.123",
+    "@budibase/string-templates": "^1.0.123",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
     "@google-cloud/firestore": "^5.0.2",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
-    "@sentry/node": "6.17.7",
-    "@types/global-agent": "^2.1.1",
-    "@types/koa__router": "^8.0.11",
+    "@sentry/node": "^6.0.0",
     "airtable": "0.10.1",
     "arangojs": "7.2.0",
     "aws-sdk": "^2.767.0",
@@ -94,7 +91,6 @@
     "fix-path": "3.0.0",
     "form-data": "^4.0.0",
     "fs-extra": "8.1.0",
-    "global-agent": "^3.0.0",
     "google-auth-library": "^7.11.0",
     "google-spreadsheet": "^3.2.0",
     "jimp": "0.16.1",
@@ -147,20 +143,18 @@
     "@types/apidoc": "^0.50.0",
     "@types/bull": "^3.15.1",
     "@types/google-spreadsheet": "^3.1.5",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^26.0.23",
     "@types/koa": "^2.13.3",
     "@types/koa-router": "^7.4.2",
     "@types/lodash": "4.14.180",
     "@types/node": "^15.12.4",
     "@types/oracledb": "^5.2.1",
     "@types/redis": "^4.0.11",
-    "@typescript-eslint/parser": "5.12.0",
     "apidoc": "^0.50.2",
     "babel-jest": "^27.0.2",
     "copyfiles": "^2.4.1",
     "docker-compose": "^0.23.6",
     "eslint": "^6.8.0",
-    "ioredis-mock": "^7.2.0",
     "is-wsl": "^2.2.0",
     "jest": "^27.0.5",
     "jest-openapi": "^0.14.2",
@@ -174,11 +168,11 @@
     "swagger-jsdoc": "^6.1.0",
     "ts-jest": "^27.0.3",
     "ts-node": "^10.0.0",
-    "typescript": "^4.5.5",
+    "typescript": "^4.3.5",
     "update-dotenv": "^1.1.1"
   },
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "94632aed5c844bb780b9a81238207b4965c40a54"
+  "gitHead": "db99c31b53d0dbbb788335126e45d1cc2f39fbf0"
 }

package/scripts/dev/manage.js

@@ -42,8 +42,6 @@ async function init() {
       REDIS_URL: "localhost:6379",
       WORKER_URL: "http://localhost:4002",
       INTERNAL_API_KEY: "budibase",
-      ACCOUNT_PORTAL_URL: "http://localhost:10001",
-      ACCOUNT_PORTAL_API_KEY: "budibase",
       JWT_SECRET: "testsecret",
       REDIS_PASSWORD: "budibase",
       MINIO_ACCESS_KEY: "budibase",

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

@@ -1,29 +1,29 @@
-import env from "../../environment"
-import packageJson from "../../../package.json"
-import {
+const env = require("../../environment")
+const packageJson = require("../../../package.json")
+const {
   createLinkView,
   createRoutingView,
   createAllSearchIndex,
-} from "../../db/views/staticViews"
-import {
+} = require("../../db/views/staticViews")
+const {
   getTemplateStream,
   createApp,
   deleteApp,
-} from "../../utilities/fileSystem"
-import {
+} = require("../../utilities/fileSystem")
+const {
   generateAppID,
   getLayoutParams,
   getScreenParams,
   generateDevAppID,
   DocumentTypes,
   AppStatus,
-} from "../../db/utils"
+} = require("../../db/utils")
 const {
   BUILTIN_ROLE_IDS,
   AccessController,
 } = require("@budibase/backend-core/roles")
-import { BASE_LAYOUTS } from "../../constants/layouts"
-import { cloneDeep } from "lodash/fp"
+const { BASE_LAYOUTS } = require("../../constants/layouts")
+const { cloneDeep } = require("lodash/fp")
 const { processObject } = require("@budibase/string-templates")
 const {
   getAllApps,
@@ -31,27 +31,24 @@ const {
   getProdAppID,
   Replication,
 } = require("@budibase/backend-core/db")
-import { USERS_TABLE_SCHEMA } from "../../constants"
-import { removeAppFromUserRoles } from "../../utilities/workerRequests"
-import { clientLibraryPath, stringToReadStream } from "../../utilities"
-import { getAllLocks } from "../../utilities/redis"
-import {
+const { USERS_TABLE_SCHEMA } = require("../../constants")
+const { removeAppFromUserRoles } = require("../../utilities/workerRequests")
+const { clientLibraryPath, stringToReadStream } = require("../../utilities")
+const { getAllLocks } = require("../../utilities/redis")
+const {
   updateClientLibrary,
   backupClientLibrary,
   revertClientLibrary,
-} from "../../utilities/fileSystem/clientLibrary"
+} = require("../../utilities/fileSystem/clientLibrary")
 const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
-import { syncGlobalUsers } from "./user"
+const { syncGlobalUsers } = require("./user")
 const { app: appCache } = require("@budibase/backend-core/cache")
-import { cleanupAutomations } from "../../automations/utils"
+const { cleanupAutomations } = require("../../automations/utils")
 const {
   getAppDB,
   getProdAppDB,
   updateAppId,
 } = require("@budibase/backend-core/context")
-import { getUniqueRows } from "../../utilities/usageQuota/rows"
-import { quotas } from "@budibase/pro"
-import { errors } from "@budibase/backend-core"
 
 const URL_REGEX_SLASH = /\/|\\/g
 
@@ -64,7 +61,7 @@ async function getLayouts() {
         include_docs: true,
       })
     )
-  ).rows.map((row: any) => row.doc)
+  ).rows.map(row => row.doc)
 }
 
 async function getScreens() {
@@ -75,16 +72,16 @@ async function getScreens() {
         include_docs: true,
       })
     )
-  ).rows.map((row: any) => row.doc)
+  ).rows.map(row => row.doc)
 }
 
-function getUserRoleId(ctx: any) {
+function getUserRoleId(ctx) {
   return !ctx.user.role || !ctx.user.role._id
     ? BUILTIN_ROLE_IDS.PUBLIC
     : ctx.user.role._id
 }
 
-export const getAppUrl = (ctx: any) => {
+exports.getAppUrl = ctx => {
   // construct the url
   let url
   if (ctx.request.body.url) {
@@ -100,34 +97,29 @@ export const getAppUrl = (ctx: any) => {
   return url
 }
 
-const checkAppUrl = (ctx: any, apps: any, url: any, currentAppId?: string) => {
+const checkAppUrl = (ctx, apps, url, currentAppId) => {
   if (currentAppId) {
-    apps = apps.filter((app: any) => app.appId !== currentAppId)
+    apps = apps.filter(app => app.appId !== currentAppId)
   }
-  if (apps.some((app: any) => app.url === url)) {
+  if (apps.some(app => app.url === url)) {
     ctx.throw(400, "App URL is already in use.")
   }
 }
 
-const checkAppName = (
-  ctx: any,
-  apps: any,
-  name: any,
-  currentAppId?: string
-) => {
+const checkAppName = (ctx, apps, name, currentAppId) => {
   // TODO: Replace with Joi
   if (!name) {
     ctx.throw(400, "Name is required")
   }
   if (currentAppId) {
-    apps = apps.filter((app: any) => app.appId !== currentAppId)
+    apps = apps.filter(app => app.appId !== currentAppId)
   }
-  if (apps.some((app: any) => app.name === name)) {
+  if (apps.some(app => app.name === name)) {
     ctx.throw(400, "App name is already in use.")
   }
 }
 
-async function createInstance(template: any) {
+async function createInstance(template) {
   const tenantId = isMultiTenant() ? getTenantId() : null
   const baseAppId = generateAppID(tenantId)
   const appId = generateDevAppID(baseAppId)
@@ -168,7 +160,7 @@ async function createInstance(template: any) {
   return { _id: appId }
 }
 
-export const fetch = async (ctx: any) => {
+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 })
@@ -180,7 +172,7 @@ export const fetch = async (ctx: any) => {
       if (app.status !== "development") {
         continue
       }
-      const lock = locks.find((lock: any) => lock.appId === app.appId)
+      const lock = locks.find(lock => lock.appId === app.appId)
       if (lock) {
         app.lockedBy = lock.user
       } else {
@@ -193,7 +185,7 @@ export const fetch = async (ctx: any) => {
   ctx.body = apps
 }
 
-export const fetchAppDefinition = async (ctx: any) => {
+exports.fetchAppDefinition = async ctx => {
   const layouts = await getLayouts()
   const userRoleId = getUserRoleId(ctx)
   const accessController = new AccessController()
@@ -208,7 +200,7 @@ export const fetchAppDefinition = async (ctx: any) => {
   }
 }
 
-export const fetchAppPackage = async (ctx: any) => {
+exports.fetchAppPackage = async ctx => {
   const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
   const layouts = await getLayouts()
@@ -229,7 +221,7 @@ export const fetchAppPackage = async (ctx: any) => {
   }
 }
 
-const performAppCreate = async (ctx: any) => {
+exports.create = async ctx => {
   const apps = await getAllApps({ dev: true })
   const name = ctx.request.body.name
   checkAppName(ctx, apps, name)
@@ -237,7 +229,7 @@ const performAppCreate = async (ctx: any) => {
   checkAppUrl(ctx, apps, url)
 
   const { useTemplate, templateKey, templateString } = ctx.request.body
-  const instanceConfig: any = {
+  const instanceConfig = {
     useTemplate,
     key: templateKey,
     templateString,
@@ -288,41 +280,13 @@ const performAppCreate = async (ctx: any) => {
   }
 
   await appCache.invalidateAppMetadata(appId, newApplication)
-  return newApplication
-}
-
-const appPostCreate = async (ctx: any, appId: string) => {
-  // app import & template creation
-  if (ctx.request.body.useTemplate === "true") {
-    const rows = await getUniqueRows([appId])
-    const rowCount = rows ? rows.length : 0
-    if (rowCount) {
-      try {
-        await quotas.addRows(rowCount)
-      } catch (err: any) {
-        if (err.code && err.code === errors.codes.USAGE_LIMIT_EXCEEDED) {
-          // this import resulted in row usage exceeding the quota
-          // delete the app
-          // skip pre and post steps as no rows have been added to quotas yet
-          ctx.params.appId = appId
-          await destroyApp(ctx)
-        }
-        throw err
-      }
-    }
-  }
-}
-
-export const create = async (ctx: any) => {
-  const newApplication = await quotas.addApp(() => performAppCreate(ctx))
-  await appPostCreate(ctx, newApplication.appId)
-  ctx.body = newApplication
   ctx.status = 200
+  ctx.body = newApplication
 }
 
 // This endpoint currently operates as a PATCH rather than a PUT
 // Thus name and url fields are handled only if present
-export const update = async (ctx: any) => {
+exports.update = async ctx => {
   const apps = await getAllApps({ dev: true })
   // validation
   const name = ctx.request.body.name
@@ -340,7 +304,7 @@ export const update = async (ctx: any) => {
   ctx.body = data
 }
 
-export const updateClient = async (ctx: any) => {
+exports.updateClient = async ctx => {
   // Get current app version
   const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
@@ -362,7 +326,7 @@ export const updateClient = async (ctx: any) => {
   ctx.body = data
 }
 
-export const revertClient = async (ctx: any) => {
+exports.revertClient = async ctx => {
   // Check app can be reverted
   const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
@@ -385,57 +349,26 @@ export const revertClient = async (ctx: any) => {
   ctx.body = data
 }
 
-const destroyApp = async (ctx: any) => {
-  let appId = ctx.params.appId
-  let isUnpublish = ctx.query && ctx.query.unpublish
-
-  if (isUnpublish) {
-    appId = getProdAppID(appId)
-  }
+exports.delete = async ctx => {
+  const db = getAppDB()
 
-  const db = isUnpublish ? getProdAppDB() : getAppDB()
   const result = await db.destroy()
-
-  if (isUnpublish) {
-    await quotas.removePublishedApp()
-  } else {
-    await quotas.removeApp()
-  }
-
   /* istanbul ignore next */
-  if (!env.isTest() && !isUnpublish) {
-    await deleteApp(appId)
+  if (!env.isTest() && !ctx.query.unpublish) {
+    await deleteApp(ctx.params.appId)
   }
-  if (isUnpublish) {
-    await cleanupAutomations(appId)
+  if (ctx.query && ctx.query.unpublish) {
+    await cleanupAutomations(ctx.params.appId)
   }
   // make sure the app/role doesn't stick around after the app has been deleted
-  await removeAppFromUserRoles(ctx, appId)
-  await appCache.invalidateAppMetadata(appId)
-  return result
-}
-
-const preDestroyApp = async (ctx: any) => {
-  const rows = await getUniqueRows([ctx.params.appId])
-  ctx.rowCount = rows.length
-}
-
-const postDestroyApp = async (ctx: any) => {
-  const rowCount = ctx.rowCount
-  if (rowCount) {
-    await quotas.removeRows(rowCount)
-  }
-}
+  await removeAppFromUserRoles(ctx, ctx.params.appId)
+  await appCache.invalidateAppMetadata(ctx.params.appId)
 
-export const destroy = async (ctx: any) => {
-  await preDestroyApp(ctx)
-  const result = await destroyApp(ctx)
-  await postDestroyApp(ctx)
   ctx.status = 200
   ctx.body = result
 }
 
-export const sync = async (ctx: any, next: any) => {
+exports.sync = async (ctx, next) => {
   const appId = ctx.params.appId
   if (!isDevAppID(appId)) {
     ctx.throw(400, "This action cannot be performed for production apps")
@@ -465,7 +398,7 @@ export const sync = async (ctx: any, next: any) => {
   let error
   try {
     await replication.replicate({
-      filter: function (doc: any) {
+      filter: function (doc) {
         return doc._id !== DocumentTypes.APP_METADATA
       },
     })
@@ -487,7 +420,7 @@ export const sync = async (ctx: any, next: any) => {
   }
 }
 
-const updateAppPackage = async (appPackage: any, appId: any) => {
+const updateAppPackage = async (appPackage, appId) => {
   const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
 
@@ -506,7 +439,7 @@ const updateAppPackage = async (appPackage: any, appId: any) => {
   return response
 }
 
-const createEmptyAppPackage = async (ctx: any, app: any) => {
+const createEmptyAppPackage = async (ctx, app) => {
   const db = getAppDB()
 
   let screensAndLayouts = []