@budibase/server 1.0.49-alpha.0 → 1.0.49-alpha.12

package/dist/db/linkedRows/LinkController.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../index");
 const { IncludeDocs, getLinkDocuments } = require("./linkUtils");
 const { generateLinkID, InternalTables, getUserMetadataParams, } = require("../utils");
 const Sentry = require("@sentry/node");
 const { FieldTypes, RelationshipTypes } = require("../../constants");
+const { getAppDB } = require("@budibase/backend-core/context");
 /**
  * Creates a new link document structure which can be put to the database. It is important to
  * note that while this talks about linker/linked the link is bi-directional and for all intent
@@ -42,9 +42,8 @@ function LinkDocument(tableId1, fieldName1, rowId1, tableId2, fieldName2, rowId2
     };
 }
 class LinkController {
-    constructor({ appId, tableId, row, table, oldTable }) {
-        this._appId = appId;
-        this._db = new CouchDB(appId);
+    constructor({ tableId, row, table, oldTable }) {
+        this._db = getAppDB();
         this._tableId = tableId;
         this._row = row;
         this._table = table;
@@ -90,7 +89,6 @@ class LinkController {
      */
     getRowLinkDocs(rowId) {
         return getLinkDocuments({
-            appId: this._appId,
             tableId: this._tableId,
             rowId,
             includeDocs: IncludeDocs.INCLUDE,
@@ -101,7 +99,6 @@ class LinkController {
      */
     getTableLinkDocs() {
         return getLinkDocuments({
-            appId: this._appId,
             tableId: this._tableId,
             includeDocs: IncludeDocs.INCLUDE,
         });
@@ -203,7 +200,6 @@ class LinkController {
                     for (let linkId of rowField) {
                         if (linkedSchema.relationshipType === RelationshipTypes.ONE_TO_MANY) {
                             let links = (yield getLinkDocuments({
-                                appId: this._appId,
                                 tableId: field.tableId,
                                 rowId: linkId,
                                 includeDocs: IncludeDocs.EXCLUDE,

package/dist/db/linkedRows/index.js

@@ -11,12 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const LinkController = require("./LinkController");
 const { IncludeDocs, getLinkDocuments, createLinkView, getUniqueByProp, getRelatedTableForField, getLinkedTableIDs, getLinkedTable, } = require("./linkUtils");
 const { flatten } = require("lodash");
-const CouchDB = require("../../db");
 const { FieldTypes } = require("../../constants");
 const { getMultiIDParams, USER_METDATA_PREFIX } = require("../../db/utils");
 const { partition } = require("lodash");
 const { getGlobalUsersFromMetadata } = require("../../utilities/global");
 const { processFormulas } = require("../../utilities/rowProcessor/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
 /**
  * This functionality makes sure that when rows with links are created, updated or deleted they are processed
  * correctly - making sure that no stale links are left around and that all links have been made successfully.
@@ -45,12 +45,11 @@ function clearRelationshipFields(table, rows) {
     }
     return rows;
 }
-function getLinksForRows(appId, rows) {
+function getLinksForRows(rows) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableIds = [...new Set(rows.map(el => el.tableId))];
         // start by getting all the link values for performance reasons
         const responses = flatten(yield Promise.all(tableIds.map(tableId => getLinkDocuments({
-            appId,
             tableId: tableId,
             includeDocs: IncludeDocs.EXCLUDE,
         }))));
@@ -61,10 +60,10 @@ function getLinksForRows(appId, rows) {
             .map(el => (Object.assign(Object.assign({}, el), { unique: el.id + el.thisId + el.fieldName }))), "unique");
     });
 }
-function getFullLinkedDocs(ctx, appId, links) {
+function getFullLinkedDocs(links) {
     return __awaiter(this, void 0, void 0, function* () {
         // create DBs
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const linkedRowIds = links.map(link => link.id);
         const uniqueRowIds = [...new Set(linkedRowIds)];
         let dbRows = (yield db.allDocs(getMultiIDParams(uniqueRowIds))).rows.map(row => row.doc);
@@ -74,7 +73,7 @@ function getFullLinkedDocs(ctx, appId, links) {
             .filter(row => row != null);
         // need to handle users as specific cases
         let [users, other] = partition(linked, linkRow => linkRow._id.startsWith(USER_METDATA_PREFIX));
-        users = yield getGlobalUsersFromMetadata(appId, users);
+        users = yield getGlobalUsersFromMetadata(users);
         return [...other, ...users];
     });
 }
@@ -82,21 +81,17 @@ function getFullLinkedDocs(ctx, appId, links) {
  * Update link documents for a row or table - this is to be called by the API controller when a change is occurring.
  * @param {string} args.eventType states what type of change which is occurring, means this can be expanded upon in the
  * future quite easily (all updates go through one function).
- * @param {string} args.appId The ID of the instance in which the change is occurring.
  * @param {string} args.tableId The ID of the of the table which is being changed.
- * @param {object|null} args.row The row which is changing, e.g. created, updated or deleted.
- * @param {object|null} args.table If the table has already been retrieved this can be used to reduce database gets.
- * @param {object|null} args.oldTable If the table is being updated then the old table can be provided for differencing.
+ * @param {object|undefined} args.row The row which is changing, e.g. created, updated or deleted.
+ * @param {object|undefined} args.table If the table has already been retrieved this can be used to reduce database gets.
+ * @param {object|undefined} args.oldTable If the table is being updated then the old table can be provided for differencing.
  * @returns {Promise<object>} When the update is complete this will respond successfully. Returns the row for
  * row operations and the table for table operations.
  */
 exports.updateLinks = function (args) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { eventType, appId, row, tableId, table, oldTable } = args;
+        const { eventType, row, tableId, table, oldTable } = args;
         const baseReturnObj = row == null ? table : row;
-        if (appId == null) {
-            throw "Cannot operate without an instance ID.";
-        }
         // make sure table ID is set
         if (tableId == null && table != null) {
             args.tableId = table._id;
@@ -132,25 +127,21 @@ exports.updateLinks = function (args) {
 /**
  * Given a table and a list of rows this will retrieve all of the attached docs and enrich them into the row.
  * This is required for formula fields, this may only be utilised internally (for now).
- * @param {object} ctx The request which is looking for rows.
  * @param {object} table The table from which the rows originated.
  * @param {array<object>} rows The rows which are to be enriched.
  * @return {Promise<*>} returns the rows with all of the enriched relationships on it.
  */
-exports.attachFullLinkedDocs = (ctx, table, rows) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
+exports.attachFullLinkedDocs = (table, rows) => __awaiter(void 0, void 0, void 0, function* () {
     const linkedTableIds = getLinkedTableIDs(table);
     if (linkedTableIds.length === 0) {
         return rows;
     }
-    // create DBs
-    const db = new CouchDB(appId);
     // get all the links
-    const links = (yield getLinksForRows(appId, rows)).filter(link => rows.some(row => row._id === link.thisId));
+    const links = (yield getLinksForRows(rows)).filter(link => rows.some(row => row._id === link.thisId));
     // clear any existing links that could be dupe'd
     rows = clearRelationshipFields(table, rows);
     // now get the docs and combine into the rows
-    let linked = yield getFullLinkedDocs(ctx, appId, links);
+    let linked = yield getFullLinkedDocs(links);
     const linkedTables = [];
     for (let row of rows) {
         for (let link of links.filter(link => link.thisId === row._id)) {
@@ -160,7 +151,7 @@ exports.attachFullLinkedDocs = (ctx, table, rows) => __awaiter(void 0, void 0, v
             const linkedRow = linked.find(row => row._id === link.id);
             if (linkedRow) {
                 const linkedTableId = linkedRow.tableId || getRelatedTableForField(table, link.fieldName);
-                const linkedTable = yield getLinkedTable(db, linkedTableId, linkedTables);
+                const linkedTable = yield getLinkedTable(linkedTableId, linkedTables);
                 if (linkedTable) {
                     row[link.fieldName].push(processFormulas(linkedTable, linkedRow));
                 }
@@ -171,18 +162,16 @@ exports.attachFullLinkedDocs = (ctx, table, rows) => __awaiter(void 0, void 0, v
 });
 /**
  * This function will take the given enriched rows and squash the links to only contain the primary display field.
- * @param {string} appId The app in which the tables/rows/links exist.
  * @param {object} table The table from which the rows originated.
  * @param {array<object>} enriched The pre-enriched rows (full docs) which are to be squashed.
  * @returns {Promise<Array>} The rows after having their links squashed to only contain the ID and primary display.
  */
-exports.squashLinksToPrimaryDisplay = (appId, table, enriched) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.squashLinksToPrimaryDisplay = (table, enriched) => __awaiter(void 0, void 0, void 0, function* () {
     // will populate this as we find them
     const linkedTables = [table];
     for (let row of enriched) {
         // this only fetches the table if its not already in array
-        const rowTable = yield getLinkedTable(db, row.tableId, linkedTables);
+        const rowTable = yield getLinkedTable(row.tableId, linkedTables);
         for (let [column, schema] of Object.entries(rowTable.schema)) {
             if (schema.type !== FieldTypes.LINK || !Array.isArray(row[column])) {
                 continue;
@@ -190,7 +179,7 @@ exports.squashLinksToPrimaryDisplay = (appId, table, enriched) => __awaiter(void
             const newLinks = [];
             for (let link of row[column]) {
                 const linkTblId = link.tableId || getRelatedTableForField(table, column);
-                const linkedTable = yield getLinkedTable(db, linkTblId, linkedTables);
+                const linkedTable = yield getLinkedTable(linkTblId, linkedTables);
                 const obj = { _id: link._id };
                 if (link[linkedTable.primaryDisplay]) {
                     obj.primaryDisplay = link[linkedTable.primaryDisplay];

package/dist/db/linkedRows/linkUtils.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../index");
 const Sentry = require("@sentry/node");
 const { ViewNames, getQueryIndex } = require("../utils");
 const { FieldTypes } = require("../../constants");
 const { createLinkView } = require("../views/staticViews");
+const { getAppDB } = require("@budibase/backend-core/context");
 /**
  * Only needed so that boolean parameters are being used for includeDocs
  * @type {{EXCLUDE: boolean, INCLUDE: boolean}}
@@ -24,7 +24,6 @@ exports.IncludeDocs = {
 exports.createLinkView = createLinkView;
 /**
  * Gets the linking documents, not the linked documents themselves.
- * @param {string} args.appId The instance in which we are searching for linked rows.
  * @param {string} args.tableId The table which we are searching for linked rows against.
  * @param {string|null} args.fieldName The name of column/field which is being altered, only looking for
  * linking documents that are related to it. If this is not specified then the table level will be assumed.
@@ -38,8 +37,8 @@ exports.createLinkView = createLinkView;
  */
 exports.getLinkDocuments = function (args) {
     return __awaiter(this, arguments, void 0, function* () {
-        const { appId, tableId, rowId, includeDocs } = args;
-        const db = new CouchDB(appId);
+        const { tableId, rowId, includeDocs } = args;
+        const db = getAppDB();
         let params;
         if (rowId != null) {
             params = { key: [tableId, rowId] };
@@ -75,7 +74,7 @@ exports.getLinkDocuments = function (args) {
         catch (err) {
             // check if the view doesn't exist, it should for all new instances
             if (err != null && err.name === "not_found") {
-                yield exports.createLinkView(appId);
+                yield exports.createLinkView();
                 return exports.getLinkDocuments(arguments[0]);
             }
             else {
@@ -95,7 +94,8 @@ exports.getLinkedTableIDs = table => {
         .filter(column => column.type === FieldTypes.LINK)
         .map(column => column.tableId);
 };
-exports.getLinkedTable = (db, id, tables) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getLinkedTable = (id, tables) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     let linkedTable = tables.find(table => table._id === id);
     if (linkedTable) {
         return linkedTable;

package/dist/db/views/staticViews.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../index");
+const { getAppDB } = require("@budibase/backend-core/context");
 const { DocumentTypes, SEPARATOR, ViewNames, SearchIndexes, } = require("../utils");
 const SCREEN_PREFIX = DocumentTypes.SCREEN + SEPARATOR;
 /**************************************************
@@ -24,12 +24,11 @@ const SCREEN_PREFIX = DocumentTypes.SCREEN + SEPARATOR;
 /**
  * Creates the link view for the instance, this will overwrite the existing one, but this should only
  * be called if it is found that the view does not exist.
- * @param {string} appId The instance to which the view should be added.
  * @returns {Promise<void>} The view now exists, please note that the next view of this query will actually build it,
  * so it may be slow.
  */
-exports.createLinkView = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const designDoc = yield db.get("_design/database");
     const view = {
         map: function (doc) {
@@ -56,8 +55,8 @@ exports.createLinkView = (appId) => __awaiter(void 0, void 0, void 0, function*
     designDoc.views = Object.assign(Object.assign({}, designDoc.views), { [ViewNames.LINK]: view });
     yield db.put(designDoc);
 });
-exports.createRoutingView = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.createRoutingView = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const designDoc = yield db.get("_design/database");
     const view = {
         // if using variables in a map function need to inject them before use
@@ -73,9 +72,9 @@ exports.createRoutingView = (appId) => __awaiter(void 0, void 0, void 0, functio
     designDoc.views = Object.assign(Object.assign({}, designDoc.views), { [ViewNames.ROUTING]: view });
     yield db.put(designDoc);
 });
-function searchIndex(appId, indexName, fnString) {
+function searchIndex(indexName, fnString) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const designDoc = yield db.get("_design/database");
         designDoc.indexes = {
             [indexName]: {
@@ -86,8 +85,8 @@ function searchIndex(appId, indexName, fnString) {
         yield db.put(designDoc);
     });
 }
-exports.createAllSearchIndex = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    yield searchIndex(appId, SearchIndexes.ROWS, function (doc) {
+exports.createAllSearchIndex = () => __awaiter(void 0, void 0, void 0, function* () {
+    yield searchIndex(SearchIndexes.ROWS, function (doc) {
         function idx(input, prev) {
             for (let key of Object.keys(input)) {
                 let idxKey = prev != null ? `${prev}.${key}` : key;

package/dist/environment.js

@@ -2,7 +2,8 @@
 function isTest() {
     return (process.env.NODE_ENV === "jest" ||
         process.env.NODE_ENV === "cypress" ||
-        process.env.JEST_WORKER_ID != null);
+        (process.env.JEST_WORKER_ID != null &&
+            process.env.JEST_WORKER_ID !== "null"));
 }
 function isDev() {
     return (process.env.NODE_ENV !== "production" &&
@@ -35,6 +36,7 @@ module.exports = {
     REDIS_PASSWORD: process.env.REDIS_PASSWORD,
     INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
+    HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
     // environment
     NODE_ENV: process.env.NODE_ENV,
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,

package/dist/integrations/base/sql.js

@@ -177,20 +177,55 @@ class InternalBuilder {
         if (!relationships) {
             return query;
         }
+        const tableSets = {};
+        // aggregate into table sets (all the same to tables)
         for (let relationship of relationships) {
-            const from = relationship.from, to = relationship.to, toTable = relationship.tableName;
-            if (!relationship.through) {
+            const keyObj = {
+                toTable: relationship.tableName,
+                throughTable: undefined,
+            };
+            if (relationship.through) {
+                keyObj.throughTable = relationship.through;
+            }
+            const key = JSON.stringify(keyObj);
+            if (tableSets[key]) {
+                tableSets[key].push(relationship);
+            }
+            else {
+                tableSets[key] = [relationship];
+            }
+        }
+        for (let [key, relationships] of Object.entries(tableSets)) {
+            const { toTable, throughTable } = JSON.parse(key);
+            if (!throughTable) {
                 // @ts-ignore
-                query = query.leftJoin(toTable, `${fromTable}.${from}`, `${toTable}.${to}`);
+                query = query.join(toTable, function () {
+                    for (let relationship of relationships) {
+                        const from = relationship.from, to = relationship.to;
+                        // @ts-ignore
+                        this.orOn(`${fromTable}.${from}`, "=", `${toTable}.${to}`);
+                    }
+                }, "left");
             }
             else {
-                const throughTable = relationship.through;
-                const fromPrimary = relationship.fromPrimary;
-                const toPrimary = relationship.toPrimary;
                 query = query
                     // @ts-ignore
-                    .leftJoin(throughTable, `${fromTable}.${fromPrimary}`, `${throughTable}.${from}`)
-                    .leftJoin(toTable, `${toTable}.${toPrimary}`, `${throughTable}.${to}`);
+                    .join(throughTable, function () {
+                    for (let relationship of relationships) {
+                        const fromPrimary = relationship.fromPrimary;
+                        const from = relationship.from;
+                        // @ts-ignore
+                        this.orOn(`${fromTable}.${fromPrimary}`, "=", `${throughTable}.${from}`);
+                    }
+                }, "left")
+                    .join(toTable, function () {
+                    for (let relationship of relationships) {
+                        const toPrimary = relationship.toPrimary;
+                        const to = relationship.to;
+                        // @ts-ignore
+                        this.orOn(`${toTable}.${toPrimary}`, `${throughTable}.${to}`);
+                    }
+                }, "left");
             }
         }
         return query.limit(BASE_LIMIT);

package/dist/integrations/utils.js

@@ -52,6 +52,9 @@ function buildExternalTableId(datasourceId, tableName) {
 }
 exports.buildExternalTableId = buildExternalTableId;
 function breakExternalTableId(tableId) {
+    if (!tableId) {
+        return {};
+    }
     const parts = tableId.split(DOUBLE_SEPARATOR);
     let tableName = parts.pop();
     // if they need joined

package/dist/middleware/authorized.js

@@ -13,6 +13,7 @@ const { PermissionTypes, doesHaveBasePermission, } = require("@budibase/backend-
 const builderMiddleware = require("./builder");
 const { isWebhookEndpoint } = require("./utils");
 const { buildCsrfMiddleware } = require("@budibase/backend-core/auth");
+const { getAppId } = require("@budibase/backend-core/context");
 function hasResource(ctx) {
     return ctx.resourceId != null;
 }
@@ -38,7 +39,7 @@ const checkAuthorized = (ctx, resourceRoles, permType, permLevel) => __awaiter(v
 const checkAuthorizedResource = (ctx, resourceRoles, permType, permLevel) => __awaiter(void 0, void 0, void 0, function* () {
     // get the user's roles
     const roleId = ctx.roleId || BUILTIN_ROLE_IDS.PUBLIC;
-    const userRoles = yield getUserRoleHierarchy(ctx.appId, roleId, {
+    const userRoles = yield getUserRoleHierarchy(roleId, {
         idOnly: false,
     });
     const permError = "User does not have permission";
@@ -70,8 +71,9 @@ module.exports =
         yield builderMiddleware(ctx, permType);
         // get the resource roles
         let resourceRoles = [];
-        if (ctx.appId && hasResource(ctx)) {
-            resourceRoles = yield getRequiredResourceRole(ctx.appId, permLevel, ctx);
+        const appId = getAppId();
+        if (appId && hasResource(ctx)) {
+            resourceRoles = yield getRequiredResourceRole(permLevel, ctx);
         }
         // if the resource is public, proceed
         const isPublicResource = resourceRoles.includes(BUILTIN_ROLE_IDS.PUBLIC);

package/dist/middleware/builder.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { APP_DEV_PREFIX } = require("../db/utils");
 const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require("../utilities/redis");
-const CouchDB = require("../db");
+const { getDB } = require("@budibase/backend-core/db");
 const { DocumentTypes } = require("../db/utils");
 const { PermissionTypes } = require("@budibase/backend-core/permissions");
 const { app: appCache } = require("@budibase/backend-core/cache");
@@ -49,7 +49,7 @@ function updateAppUpdatedAt(ctx) {
         if (ctx.method === "GET" || (yield checkDebounce(appId))) {
             return;
         }
-        const db = new CouchDB(appId);
+        const db = getDB(appId);
         const metadata = yield db.get(DocumentTypes.APP_METADATA);
         metadata.updatedAt = new Date().toISOString();
         const response = yield db.put(metadata);

package/dist/middleware/currentapp.js

@@ -16,9 +16,9 @@ const { generateUserMetadataID, isDevAppID } = require("../db/utils");
 const { dbExists } = require("@budibase/backend-core/db");
 const { isUserInAppTenant } = require("@budibase/backend-core/tenancy");
 const { getCachedSelf } = require("../utilities/global");
-const CouchDB = require("../db");
 const env = require("../environment");
 const { isWebhookEndpoint } = require("./utils");
+const { doInAppContext } = require("@budibase/backend-core/context");
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // try to get the appID from the request
     let requestAppId = getAppId(ctx);
@@ -36,7 +36,7 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // check the app exists referenced in cookie
     if (appCookie) {
         const appId = appCookie.appId;
-        const exists = yield dbExists(CouchDB, appId);
+        const exists = yield dbExists(appId);
         if (!exists) {
             clearCookie(ctx, Cookies.CurrentApp);
             return next();
@@ -45,11 +45,13 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         requestAppId = requestAppId || appId;
     }
     // deny access to application preview
-    if (isDevAppID(requestAppId) &&
-        !isWebhookEndpoint(ctx) &&
-        (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
-        clearCookie(ctx, Cookies.CurrentApp);
-        return ctx.redirect("/");
+    if (!env.isTest()) {
+        if (isDevAppID(requestAppId) &&
+            !isWebhookEndpoint(ctx) &&
+            (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
+            clearCookie(ctx, Cookies.CurrentApp);
+            return ctx.redirect("/");
+        }
     }
     let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;
     if (!ctx.user) {
@@ -67,34 +69,36 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         return next();
     }
-    let noCookieSet = false;
-    // if the user not in the right tenant then make sure they have no permissions
-    // need to judge this only based on the request app ID,
-    if (env.MULTI_TENANCY &&
-        ctx.user &&
-        requestAppId &&
-        !isUserInAppTenant(requestAppId)) {
-        // don't error, simply remove the users rights (they are a public user)
-        delete ctx.user.builder;
-        delete ctx.user.admin;
-        delete ctx.user.roles;
-        roleId = BUILTIN_ROLE_IDS.PUBLIC;
-        noCookieSet = true;
-    }
-    ctx.appId = appId;
-    if (roleId) {
-        ctx.roleId = roleId;
-        const userId = ctx.user ? generateUserMetadataID(ctx.user._id) : null;
-        ctx.user = Object.assign(Object.assign({}, ctx.user), { 
-            // override userID with metadata one
-            _id: userId, userId,
-            roleId, role: yield getRole(appId, roleId) });
-    }
-    if ((requestAppId !== appId ||
-        appCookie == null ||
-        appCookie.appId !== requestAppId) &&
-        !noCookieSet) {
-        setCookie(ctx, { appId }, Cookies.CurrentApp);
-    }
-    return next();
+    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        let noCookieSet = false;
+        // if the user not in the right tenant then make sure they have no permissions
+        // need to judge this only based on the request app ID,
+        if (env.MULTI_TENANCY &&
+            ctx.user &&
+            requestAppId &&
+            !isUserInAppTenant(requestAppId)) {
+            // don't error, simply remove the users rights (they are a public user)
+            delete ctx.user.builder;
+            delete ctx.user.admin;
+            delete ctx.user.roles;
+            roleId = BUILTIN_ROLE_IDS.PUBLIC;
+            noCookieSet = true;
+        }
+        ctx.appId = appId;
+        if (roleId) {
+            ctx.roleId = roleId;
+            const userId = ctx.user ? generateUserMetadataID(ctx.user._id) : null;
+            ctx.user = Object.assign(Object.assign({}, ctx.user), { 
+                // override userID with metadata one
+                _id: userId, userId,
+                roleId, role: yield getRole(roleId) });
+        }
+        if ((requestAppId !== appId ||
+            appCookie == null ||
+            appCookie.appId !== requestAppId) &&
+            !noCookieSet) {
+            setCookie(ctx, { appId }, Cookies.CurrentApp);
+        }
+        return next();
+    }));
 });

package/dist/middleware/usageQuota.js

@@ -8,11 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../db");
 const usageQuota = require("../utilities/usageQuota");
 const { getUniqueRows } = require("../utilities/usageQuota/rows");
 const { isExternalTable, isRowId: isExternalRowId, } = require("../integrations/utils");
-const migration = require("../migrations/usageQuotas");
+const { getAppDB } = require("@budibase/backend-core/context");
 // currently only counting new writes and deletes
 const METHOD_MAP = {
     POST: 1,
@@ -49,7 +48,7 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         const usageId = ctx.request.body._id;
         try {
             if (ctx.appId) {
-                const db = new CouchDB(ctx.appId);
+                const db = getAppDB();
                 yield db.get(usageId);
             }
             return next();
@@ -74,7 +73,6 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         usage = files.map(file => file.size).reduce((total, size) => total + size);
     }
     try {
-        yield migration.run();
         yield performRequest(ctx, next, property, usage);
     }
     catch (err) {

package/dist/migrations/functions/appUrls.js

@@ -0,0 +1,46 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const { DocumentTypes } = require("@budibase/backend-core/db");
+const application_1 = require("../../api/controllers/application");
+/**
+ * Date:
+ * January 2022
+ *
+ * Description:
+ * Add the url to the app metadata if it doesn't exist
+ */
+const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
+    let metadata;
+    try {
+        metadata = yield appDb.get(DocumentTypes.APP_METADATA);
+    }
+    catch (e) {
+        // sometimes the metadata document doesn't exist
+        // exit early instead of failing the migration
+        console.error("Error retrieving app metadata. Skipping", e);
+        return;
+    }
+    if (!metadata.url) {
+        const context = {
+            request: {
+                body: {
+                    name: metadata.name,
+                },
+            },
+        };
+        metadata.url = application_1.getAppUrl(context);
+        console.log(`Adding url to app: ${metadata.url}`);
+        yield appDb.put(metadata);
+    }
+});
+exports.run = run;