@budibase/server 1.0.49-alpha.9 → 1.0.49

package/dist/api/controllers/row/internal.js

@@ -19,11 +19,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+const CouchDB = require("../../../db");
 const linkRows = require("../../../db/linkedRows");
-const { generateRowID, getRowParams, DocumentTypes, InternalTables, } = require("../../../db/utils");
+const { getRowParams, generateRowID, DocumentTypes, InternalTables, } = require("../../../db/utils");
 const userController = require("../user");
-const { inputProcessing, outputProcessing, cleanupAttachments, } = require("../../../utilities/rowProcessor");
+const { inputProcessing, outputProcessing, processAutoColumn, cleanupAttachments, } = require("../../../utilities/rowProcessor");
 const { FieldTypes } = require("../../../constants");
+const { isEqual } = require("lodash");
 const { validate, findRow } = require("./utils");
 const { fullSearch, paginatedSearch } = require("./internalSearch");
 const { getGlobalUsersFromMetadata } = require("../../../utilities/global");
@@ -31,13 +33,59 @@ const inMemoryViews = require("../../../db/inMemoryView");
 const env = require("../../../environment");
 const { migrateToInMemoryView, migrateToDesignView, getFromDesignDoc, getFromMemoryDoc, } = require("../view/utils");
 const { cloneDeep } = require("lodash/fp");
-const { getAppDB } = require("@budibase/backend-core/context");
-const { finaliseRow, updateRelatedFormula } = require("./staticFormula");
 const CALCULATION_TYPES = {
     SUM: "sum",
     COUNT: "count",
     STATS: "stats",
 };
+function storeResponse(ctx, db, row, oldTable, table) {
+    return __awaiter(this, void 0, void 0, function* () {
+        row.type = "row";
+        // don't worry about rev, tables handle rev/lastID updates
+        // if another row has been written since processing this will
+        // handle the auto ID clash
+        if (!isEqual(oldTable, table)) {
+            try {
+                yield db.put(table);
+            }
+            catch (err) {
+                if (err.status === 409) {
+                    const updatedTable = yield db.get(table._id);
+                    let response = processAutoColumn(null, updatedTable, row, {
+                        reprocessing: true,
+                    });
+                    yield db.put(response.table);
+                    row = response.row;
+                }
+                else {
+                    throw err;
+                }
+            }
+        }
+        const response = yield db.put(row);
+        row._rev = response.rev;
+        // process the row before return, to include relationships
+        row = yield outputProcessing(ctx, table, row, { squash: false });
+        return { row, table };
+    });
+}
+// doesn't do the outputProcessing
+function getRawTableData(ctx, db, tableId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let rows;
+        if (tableId === InternalTables.USER_METADATA) {
+            yield userController.fetchMetadata(ctx);
+            rows = ctx.body;
+        }
+        else {
+            const response = yield db.allDocs(getRowParams(tableId, null, {
+                include_docs: true,
+            }));
+            rows = response.rows.map(row => row.doc);
+        }
+        return rows;
+    });
+}
 function getView(db, viewName) {
     return __awaiter(this, void 0, void 0, function* () {
         let mainGetter = env.SELF_HOSTED ? getFromDesignDoc : getFromMemoryDoc;
@@ -66,24 +114,9 @@ function getView(db, viewName) {
         return viewInfo;
     });
 }
-function getRawTableData(ctx, db, tableId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let rows;
-        if (tableId === InternalTables.USER_METADATA) {
-            yield userController.fetchMetadata(ctx);
-            rows = ctx.body;
-        }
-        else {
-            const response = yield db.allDocs(getRowParams(tableId, null, {
-                include_docs: true,
-            }));
-            rows = response.rows.map(row => row.doc);
-        }
-        return rows;
-    });
-}
 exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
     const inputs = ctx.request.body;
     const tableId = inputs.tableId;
     const isUserTable = tableId === InternalTables.USER_METADATA;
@@ -122,27 +155,26 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     }
     // returned row is cleaned and prepared for writing to DB
     row = yield linkRows.updateLinks({
+        appId,
         eventType: linkRows.EventType.ROW_UPDATE,
         row,
         tableId: row.tableId,
         table,
     });
     // check if any attachments removed
-    yield cleanupAttachments(table, { oldRow, row });
+    yield cleanupAttachments(appId, table, { oldRow, row });
     if (isUserTable) {
         // the row has been updated, need to put it into the ctx
         ctx.request.body = row;
         yield userController.updateMetadata(ctx);
         return { row: ctx.body, table };
     }
-    return finaliseRow(table, row, {
-        oldTable: dbTable,
-        updateFormula: true,
-    });
+    return storeResponse(ctx, db, row, dbTable, table);
 });
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const appId = ctx.appId;
+        const db = new CouchDB(appId);
         let inputs = ctx.request.body;
         inputs.tableId = ctx.params.tableId;
         if (!inputs._rev && !inputs._id) {
@@ -160,25 +192,24 @@ exports.save = function (ctx) {
         }
         // make sure link rows are up to date
         row = yield linkRows.updateLinks({
+            appId,
             eventType: linkRows.EventType.ROW_SAVE,
             row,
             tableId: row.tableId,
             table,
         });
-        return finaliseRow(table, row, {
-            oldTable: dbTable,
-            updateFormula: true,
-        });
+        return storeResponse(ctx, db, row, dbTable, table);
     });
 };
 exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = ctx.appId;
     const viewName = ctx.params.viewName;
     // if this is a table view being looked for just transfer to that
     if (viewName.startsWith(DocumentTypes.TABLE)) {
         ctx.params.tableId = viewName;
         return exports.fetch(ctx);
     }
-    const db = getAppDB();
+    const db = new CouchDB(appId);
     const { calculation, group, field } = ctx.query;
     const viewInfo = yield getView(db, viewName);
     let response;
@@ -206,7 +237,7 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
                 schema: {},
             };
         }
-        rows = yield outputProcessing(table, response.rows);
+        rows = yield outputProcessing(ctx, table, response.rows);
     }
     if (calculation === CALCULATION_TYPES.STATS) {
         response.rows = response.rows.map(row => (Object.assign(Object.assign({ group: row.key, field }, row.value), { avg: row.value.sum / row.value.count })));
@@ -223,22 +254,25 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return rows;
 });
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
     const tableId = ctx.params.tableId;
     let table = yield db.get(tableId);
     let rows = yield getRawTableData(ctx, db, tableId);
-    return outputProcessing(table, rows);
+    return outputProcessing(ctx, table, rows);
 });
 exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
     const table = yield db.get(ctx.params.tableId);
-    let row = yield findRow(ctx, ctx.params.tableId, ctx.params.rowId);
-    row = yield outputProcessing(table, row);
+    let row = yield findRow(ctx, db, ctx.params.tableId, ctx.params.rowId);
+    row = yield outputProcessing(ctx, table, row);
     return row;
 });
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const appId = ctx.appId;
+        const db = new CouchDB(appId);
         const { _id, _rev } = ctx.request.body;
         let row = yield db.get(_id);
         if (row.tableId !== ctx.params.tableId) {
@@ -246,17 +280,16 @@ exports.destroy = function (ctx) {
         }
         const table = yield db.get(row.tableId);
         // update the row to include full relationships before deleting them
-        row = yield outputProcessing(table, row, { squash: false });
+        row = yield outputProcessing(ctx, table, row, { squash: false });
         // now remove the relationships
         yield linkRows.updateLinks({
+            appId,
             eventType: linkRows.EventType.ROW_DELETE,
             row,
             tableId: row.tableId,
         });
         // remove any attachments that were on the row from object storage
-        yield cleanupAttachments(table, { row });
-        // remove any static formula
-        yield updateRelatedFormula(table, row);
+        yield cleanupAttachments(appId, table, { row });
         let response;
         if (ctx.params.tableId === InternalTables.USER_METADATA) {
             ctx.params = {
@@ -272,15 +305,17 @@ exports.destroy = function (ctx) {
     });
 };
 exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
     const tableId = ctx.params.tableId;
     const table = yield db.get(tableId);
     let { rows } = ctx.request.body;
     // before carrying out any updates, make sure the rows are ready to be returned
     // they need to be the full rows (including previous relationships) for automations
-    rows = yield outputProcessing(table, rows, { squash: false });
+    rows = yield outputProcessing(ctx, table, rows, { squash: false });
     // remove the relationships first
     let updates = rows.map(row => linkRows.updateLinks({
+        appId,
         eventType: linkRows.EventType.ROW_DELETE,
         row,
         tableId: row.tableId,
@@ -297,8 +332,7 @@ exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         yield db.bulkDocs(rows.map(row => (Object.assign(Object.assign({}, row), { _deleted: true }))));
     }
     // remove any attachments that were on the rows from object storage
-    yield cleanupAttachments(table, { rows });
-    yield updateRelatedFormula(table, rows);
+    yield cleanupAttachments(appId, table, { rows });
     yield Promise.all(updates);
     return { response: { ok: true }, rows };
 });
@@ -307,46 +341,50 @@ exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.isCypress()) {
         return { rows: yield exports.fetch(ctx) };
     }
+    const appId = ctx.appId;
     const { tableId } = ctx.params;
-    const db = getAppDB();
+    const db = new CouchDB(appId);
     const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
     params.version = ctx.version;
     params.tableId = tableId;
     let response;
     if (paginate) {
-        response = yield paginatedSearch(query, params);
+        response = yield paginatedSearch(appId, query, params);
     }
     else {
-        response = yield fullSearch(query, params);
+        response = yield fullSearch(appId, query, params);
     }
     // Enrich search results with relationships
     if (response.rows && response.rows.length) {
         // enrich with global users if from users table
         if (tableId === InternalTables.USER_METADATA) {
-            response.rows = yield getGlobalUsersFromMetadata(response.rows);
+            response.rows = yield getGlobalUsersFromMetadata(appId, response.rows);
         }
         const table = yield db.get(tableId);
-        response.rows = yield outputProcessing(table, response.rows);
+        response.rows = yield outputProcessing(ctx, table, response.rows);
     }
     return response;
 });
 exports.validate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return validate({
+        appId: ctx.appId,
         tableId: ctx.params.tableId,
         row: ctx.request.body,
     });
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
     const tableId = ctx.params.tableId;
     const rowId = ctx.params.rowId;
     // need table to work out where links go in row
     let [table, row] = yield Promise.all([
         db.get(tableId),
-        findRow(ctx, tableId, rowId),
+        findRow(ctx, db, tableId, rowId),
     ]);
     // get the link docs
     const linkVals = yield linkRows.getLinkDocuments({
+        appId,
         tableId,
         rowId,
     });
@@ -370,7 +408,7 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
     let linkedRows = [];
     for (let [tableId, rows] of Object.entries(groups)) {
         // need to include the IDs in these rows for any links they may have
-        linkedRows = linkedRows.concat(yield outputProcessing(tables[tableId], rows));
+        linkedRows = linkedRows.concat(yield outputProcessing(ctx, tables[tableId], rows));
     }
     // insert the link rows in the correct place throughout the main row
     for (let fieldName of Object.keys(table.schema)) {

package/dist/api/controllers/row/internalSearch.js

@@ -11,13 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { SearchIndexes } = require("../../../db/utils");
 const fetch = require("node-fetch");
 const { getCouchUrl } = require("@budibase/backend-core/db");
-const { getAppId } = require("@budibase/backend-core/context");
 /**
  * Class to build lucene query URLs.
  * Optionally takes a base lucene query object.
  */
 class QueryBuilder {
-    constructor(base) {
+    constructor(appId, base) {
+        this.appId = appId;
         this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
@@ -34,27 +34,19 @@ class QueryBuilder {
         return this;
     }
     setLimit(limit) {
-        if (limit != null) {
-            this.limit = limit;
-        }
+        this.limit = limit;
         return this;
     }
     setSort(sort) {
-        if (sort != null) {
-            this.sort = sort;
-        }
+        this.sort = sort;
         return this;
     }
     setSortOrder(sortOrder) {
-        if (sortOrder != null) {
-            this.sortOrder = sortOrder;
-        }
+        this.sortOrder = sortOrder;
         return this;
     }
     setSortType(sortType) {
-        if (sortType != null) {
-            this.sortType = sortType;
-        }
+        this.sortType = sortType;
         return this;
     }
     setBookmark(bookmark) {
@@ -221,8 +213,7 @@ class QueryBuilder {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const appId = getAppId();
-            const url = `${getCouchUrl()}/${appId}/_design/database/_search/${SearchIndexes.ROWS}`;
+            const url = `${getCouchUrl()}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`;
             const body = this.buildSearchBody();
             return yield runQuery(url, body);
         });
@@ -255,6 +246,7 @@ const runQuery = (url, body) => __awaiter(void 0, void 0, void 0, function* () {
  * Gets round the fixed limit of 200 results from a query by fetching as many
  * pages as required and concatenating the results. This recursively operates
  * until enough results have been found.
+ * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -267,7 +259,7 @@ const runQuery = (url, body) => __awaiter(void 0, void 0, void 0, function* () {
  *   rows {array|null} Current results in the recursive search
  * @returns {Promise<*[]|*>}
  */
-const recursiveSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
+const recursiveSearch = (appId, query, params) => __awaiter(void 0, void 0, void 0, function* () {
     const bookmark = params.bookmark;
     const rows = params.rows || [];
     if (rows.length >= params.limit) {
@@ -277,7 +269,7 @@ const recursiveSearch = (query, params) => __awaiter(void 0, void 0, void 0, fun
     if (rows.length > params.limit - 200) {
         pageSize = params.limit - rows.length;
     }
-    const page = yield new QueryBuilder(query)
+    const page = yield new QueryBuilder(appId, query)
         .setVersion(params.version)
         .setTable(params.tableId)
         .setBookmark(bookmark)
@@ -293,12 +285,13 @@ const recursiveSearch = (query, params) => __awaiter(void 0, void 0, void 0, fun
         return [...rows, ...page.rows];
     }
     const newParams = Object.assign(Object.assign({}, params), { bookmark: page.bookmark, rows: [...rows, ...page.rows] });
-    return yield recursiveSearch(query, newParams);
+    return yield recursiveSearch(appId, query, newParams);
 });
 /**
  * Performs a paginated search. A bookmark will be returned to allow the next
  * page to be fetched. There is a max limit off 200 results per page in a
  * paginated search.
+ * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -310,13 +303,13 @@ const recursiveSearch = (query, params) => __awaiter(void 0, void 0, void 0, fun
  *   bookmark {string} The bookmark to resume from
  * @returns {Promise<{hasNextPage: boolean, rows: *[]}>}
  */
-exports.paginatedSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
+exports.paginatedSearch = (appId, query, params) => __awaiter(void 0, void 0, void 0, function* () {
     let limit = params.limit;
     if (limit == null || isNaN(limit) || limit < 0) {
         limit = 50;
     }
     limit = Math.min(limit, 200);
-    const search = new QueryBuilder(query)
+    const search = new QueryBuilder(appId, query)
         .setVersion(params.version)
         .setTable(params.tableId)
         .setSort(params.sort)
@@ -339,6 +332,7 @@ exports.paginatedSearch = (query, params) => __awaiter(void 0, void 0, void 0, f
  * desired amount of results. There is a limit of 1000 results to avoid
  * heavy performance hits, and to avoid client components breaking from
  * handling too much data.
+ * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -349,12 +343,12 @@ exports.paginatedSearch = (query, params) => __awaiter(void 0, void 0, void 0, f
  *   limit {number} The desired number of results
  * @returns {Promise<{rows: *}>}
  */
-exports.fullSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
+exports.fullSearch = (appId, query, params) => __awaiter(void 0, void 0, void 0, function* () {
     let limit = params.limit;
     if (limit == null || isNaN(limit) || limit < 0) {
         limit = 1000;
     }
     params.limit = Math.min(limit, 1000);
-    const rows = yield recursiveSearch(query, params);
+    const rows = yield recursiveSearch(appId, query, params);
     return { rows };
 });

package/dist/api/controllers/row/utils.js

@@ -10,12 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const validateJs = require("validate.js");
 const { cloneDeep } = require("lodash/fp");
+const CouchDB = require("../../../db");
 const { InternalTables } = require("../../../db/utils");
 const userController = require("../user");
 const { FieldTypes } = require("../../../constants");
 const { processStringSync } = require("@budibase/string-templates");
 const { makeExternalQuery } = require("../../../integrations/base/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -25,14 +25,13 @@ validateJs.extend(validateJs.validators.datetime, {
         return new Date(value).toISOString();
     },
 });
-exports.getDatasourceAndQuery = (json) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getDatasourceAndQuery = (appId, json) => __awaiter(void 0, void 0, void 0, function* () {
     const datasourceId = json.endpoint.datasourceId;
-    const db = getAppDB();
+    const db = new CouchDB(appId);
     const datasource = yield db.get(datasourceId);
     return makeExternalQuery(datasource, json);
 });
-exports.findRow = (ctx, tableId, rowId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.findRow = (ctx, db, tableId, rowId) => __awaiter(void 0, void 0, void 0, function* () {
     let row;
     // TODO remove special user case in future
     if (tableId === InternalTables.USER_METADATA) {
@@ -50,9 +49,9 @@ exports.findRow = (ctx, tableId, rowId) => __awaiter(void 0, void 0, void 0, fun
     }
     return row;
 });
-exports.validate = ({ tableId, row, table }) => __awaiter(void 0, void 0, void 0, function* () {
+exports.validate = ({ appId, tableId, row, table }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!table) {
-        const db = getAppDB();
+        const db = new CouchDB(appId);
         table = yield db.get(tableId);
     }
     const errors = {};
@@ -65,17 +64,19 @@ exports.validate = ({ tableId, row, table }) => __awaiter(void 0, void 0, void 0
         }
         let res;
         // Validate.js doesn't seem to handle array
-        if (type === FieldTypes.ARRAY && row[fieldName]) {
-            if (row[fieldName].length) {
+        if (type === FieldTypes.ARRAY) {
+            const hasValues = Array.isArray(row[fieldName]) && row[fieldName].length > 0;
+            // Check values are valid if values are specified
+            if (hasValues) {
                 row[fieldName].map(val => {
                     if (!constraints.inclusion.includes(val)) {
-                        errors[fieldName] = "Field not in list";
+                        errors[fieldName] = "Value not in list";
                     }
                 });
             }
-            else if (constraints.presence && row[fieldName].length === 0) {
-                // non required MultiSelect creates an empty array, which should not throw errors
-                errors[fieldName] = [`${fieldName} is required`];
+            // Check for required constraint
+            if (constraints.presence === true && !hasValues) {
+                errors[fieldName] = "Required field";
             }
         }
         else if (type === FieldTypes.JSON && typeof row[fieldName] === "string") {

package/dist/api/controllers/screen.js

@@ -8,18 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+const CouchDB = require("../../db");
 const { getScreenParams, generateScreenID } = require("../../db/utils");
 const { AccessController } = require("@budibase/backend-core/roles");
-const { getAppDB } = require("@budibase/backend-core/context");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
     const screens = (yield db.allDocs(getScreenParams(null, {
         include_docs: true,
     }))).rows.map(element => element.doc);
-    ctx.body = yield new AccessController().checkScreensAccess(screens, ctx.user.role._id);
+    ctx.body = yield new AccessController(appId).checkScreensAccess(screens, ctx.user.role._id);
 });
 exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
     let screen = ctx.request.body;
     if (!screen._id) {
         screen._id = generateScreenID();
@@ -29,7 +31,7 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = Object.assign(Object.assign({}, screen), { _id: response.id, _rev: response.rev });
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = new CouchDB(ctx.appId);
     yield db.remove(ctx.params.screenId, ctx.params.screenRev);
     ctx.body = {
         message: "Screen deleted successfully",

package/dist/api/controllers/static/index.js

@@ -14,16 +14,14 @@ const { resolve, join } = require("../../../utilities/centralPath");
 const uuid = require("uuid");
 const { ObjectStoreBuckets } = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
-const { getAllApps } = require("@budibase/backend-core/db");
+const { getDeployedApps } = require("../../../utilities/workerRequests");
+const CouchDB = require("../../../db");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
 const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentTypes } = require("../../../db/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
-const AWS = require("aws-sdk");
-const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1";
 function prepareUpload({ s3Key, bucket, metadata, file }) {
     return __awaiter(this, void 0, void 0, function* () {
         const response = yield upload({
@@ -43,15 +41,13 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         };
     });
 }
-function getAppIdFromUrl(ctx) {
+function checkForSelfHostedURL(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        // the "appId" component of the URL can be the id or the custom url
+        // the "appId" component of the URL may actually be a specific self hosted URL
         let possibleAppUrl = `/${encodeURI(ctx.params.appId).toLowerCase()}`;
-        // search prod apps for a url that matches, exclude dev where id is always used
-        const apps = yield getAllApps({ dev: false });
-        const app = apps.filter(a => a.url && a.url.toLowerCase() === possibleAppUrl)[0];
-        if (app && app.appId) {
-            return app.appId;
+        const apps = yield getDeployedApps();
+        if (apps[possibleAppUrl] && apps[possibleAppUrl].appId) {
+            return apps[possibleAppUrl].appId;
         }
         else {
             return ctx.params.appId;
@@ -84,9 +80,12 @@ exports.uploadFile = function (ctx) {
 };
 exports.serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let appId = yield getAppIdFromUrl(ctx);
+        let appId = ctx.params.appId;
+        if (env.SELF_HOSTED) {
+            appId = yield checkForSelfHostedURL(ctx);
+        }
         const App = require("./templates/BudibaseApp.svelte").default;
-        const db = getAppDB({ skip_setup: true });
+        const db = new CouchDB(appId, { skip_setup: true });
         const appInfo = yield db.get(DocumentTypes.APP_METADATA);
         const { head, html, css } = App.render({
             title: appInfo.name,
@@ -110,51 +109,3 @@ exports.serveClientLibrary = function (ctx) {
         });
     });
 };
-exports.getSignedUploadURL = function (ctx) {
-    var _a, _b, _c;
-    return __awaiter(this, void 0, void 0, function* () {
-        const database = getAppDB();
-        // Ensure datasource is valid
-        let datasource;
-        try {
-            const { datasourceId } = ctx.params;
-            datasource = yield database.get(datasourceId);
-            if (!datasource) {
-                ctx.throw(400, "The specified datasource could not be found");
-            }
-        }
-        catch (error) {
-            ctx.throw(400, "The specified datasource could not be found");
-        }
-        // Ensure we aren't using a custom endpoint
-        if ((_a = datasource === null || datasource === void 0 ? void 0 : datasource.config) === null || _a === void 0 ? void 0 : _a.endpoint) {
-            ctx.throw(400, "S3 datasources with custom endpoints are not supported");
-        }
-        // Determine type of datasource and generate signed URL
-        let signedUrl;
-        let publicUrl;
-        if (datasource.source === "S3") {
-            const { bucket, key } = ctx.request.body || {};
-            if (!bucket || !key) {
-                ctx.throw(400, "bucket and key values are required");
-                return;
-            }
-            try {
-                const s3 = new AWS.S3({
-                    region: AWS_REGION,
-                    accessKeyId: (_b = datasource === null || datasource === void 0 ? void 0 : datasource.config) === null || _b === void 0 ? void 0 : _b.accessKeyId,
-                    secretAccessKey: (_c = datasource === null || datasource === void 0 ? void 0 : datasource.config) === null || _c === void 0 ? void 0 : _c.secretAccessKey,
-                    apiVersion: "2006-03-01",
-                    signatureVersion: "v4",
-                });
-                const params = { Bucket: bucket, Key: key };
-                signedUrl = s3.getSignedUrl("putObject", params);
-                publicUrl = `https://${bucket}.s3.${AWS_REGION}.amazonaws.com/${key}`;
-            }
-            catch (error) {
-                ctx.throw(400, error);
-            }
-        }
-        ctx.body = { signedUrl, publicUrl };
-    });
-};