@budibase/server 1.0.46-alpha.4 → 1.0.46-alpha.5

package/dist/api/controllers/application.js

@@ -20,7 +20,7 @@ const { cloneDeep } = require("lodash/fp");
 const { processObject } = require("@budibase/string-templates");
 const { getAllApps, isDevAppID, getDeployedAppID, Replication, } = require("@budibase/backend-core/db");
 const { USERS_TABLE_SCHEMA } = require("../../constants");
-const { getDeployedApps, removeAppFromUserRoles, } = require("../../utilities/workerRequests");
+const { removeAppFromUserRoles } = require("../../utilities/workerRequests");
 const { clientLibraryPath, stringToReadStream } = require("../../utilities");
 const { getAllLocks } = require("../../utilities/redis");
 const { updateClientLibrary, backupClientLibrary, revertClientLibrary, } = require("../../utilities/fileSystem/clientLibrary");
@@ -49,31 +49,42 @@ function getUserRoleId(ctx) {
         ? BUILTIN_ROLE_IDS.PUBLIC
         : ctx.user.role._id;
 }
-function getAppUrlIfNotInUse(ctx) {
+function getAppUrl(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
+        // construct the url
         let url;
         if (ctx.request.body.url) {
+            // if the url is provided, use that
             url = encodeURI(ctx.request.body.url);
         }
-        else if (ctx.request.body.name) {
+        else {
+            // otherwise use the name
             url = encodeURI(`${ctx.request.body.name}`);
         }
-        if (url) {
-            url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase();
-        }
-        if (!env.SELF_HOSTED) {
-            return url;
-        }
-        const deployedApps = yield getDeployedApps();
-        if (url &&
-            deployedApps[url] != null &&
-            ctx.params != null &&
-            deployedApps[url].appId !== ctx.params.appId) {
-            ctx.throw(400, "App name/URL is already in use.");
-        }
+        url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase();
         return url;
     });
 }
+const checkAppUrl = (ctx, apps, url, currentAppId) => {
+    if (currentAppId) {
+        apps = apps.filter(app => app.appId !== currentAppId);
+    }
+    if (apps.some(app => app.url === url)) {
+        ctx.throw(400, "App URL is already in use.");
+    }
+};
+const checkAppName = (ctx, apps, name, currentAppId) => {
+    // TODO: Replace with Joi
+    if (!name) {
+        ctx.throw(400, "Name is required");
+    }
+    if (currentAppId) {
+        apps = apps.filter(app => app.appId !== currentAppId);
+    }
+    if (apps.some(app => app.name === name)) {
+        ctx.throw(400, "App name is already in use.");
+    }
+};
 function createInstance(template) {
     return __awaiter(this, void 0, void 0, function* () {
         const tenantId = isMultiTenant() ? getTenantId() : null;
@@ -167,6 +178,11 @@ exports.fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* (
     };
 });
 exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const apps = yield getAllApps(CouchDB, { dev: true });
+    const name = ctx.request.body.name;
+    checkAppName(ctx, apps, name);
+    const url = yield getAppUrl(ctx);
+    checkAppUrl(ctx, apps, url);
     const { useTemplate, templateKey, templateString } = ctx.request.body;
     const instanceConfig = {
         useTemplate,
@@ -178,7 +194,6 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     }
     const instance = yield createInstance(instanceConfig);
     const appId = instance._id;
-    const url = yield getAppUrlIfNotInUse(ctx);
     const db = new CouchDB(appId);
     let _rev;
     try {
@@ -196,7 +211,7 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         type: "app",
         version: packageJson.version,
         componentLibraries: ["@budibase/standard-components"],
-        name: ctx.request.body.name,
+        name: name,
         url: url,
         template: ctx.request.body.template,
         instance: instance,
@@ -220,7 +235,14 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = newApplication;
 });
 exports.update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const data = yield updateAppPackage(ctx, ctx.request.body, ctx.params.appId);
+    const apps = yield getAllApps(CouchDB, { dev: true });
+    // validation
+    const name = ctx.request.body.name;
+    checkAppName(ctx, apps, name, ctx.params.appId);
+    const url = yield getAppUrl(ctx);
+    checkAppUrl(ctx, apps, url, ctx.params.appId);
+    const appPackageUpdates = { name, url };
+    const data = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     ctx.status = 200;
     ctx.body = data;
 });
@@ -239,7 +261,7 @@ exports.updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         version: packageJson.version,
         revertableVersion: currentVersion,
     };
-    const data = yield updateAppPackage(ctx, appPackageUpdates, ctx.params.appId);
+    const data = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     ctx.status = 200;
     ctx.body = data;
 });
@@ -259,7 +281,7 @@ exports.revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         version: application.revertableVersion,
         revertableVersion: null,
     };
-    const data = yield updateAppPackage(ctx, appPackageUpdates, ctx.params.appId);
+    const data = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     ctx.status = 200;
     ctx.body = data;
 });
@@ -326,11 +348,10 @@ exports.sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         };
     }
 });
-const updateAppPackage = (ctx, appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const url = yield getAppUrlIfNotInUse(ctx);
+const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
     const db = new CouchDB(appId);
     const application = yield db.get(DocumentTypes.APP_METADATA);
-    const newAppPackage = Object.assign(Object.assign(Object.assign({}, application), appPackage), { url });
+    const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
     if (appPackage._rev !== application._rev) {
         newAppPackage._rev = application._rev;
     }

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

@@ -14,7 +14,7 @@ const { resolve, join } = require("../../../utilities/centralPath");
 const uuid = require("uuid");
 const { ObjectStoreBuckets } = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
-const { getDeployedApps } = require("../../../utilities/workerRequests");
+const { getAllApps } = require("@budibase/backend-core/db");
 const CouchDB = require("../../../db");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
@@ -43,13 +43,15 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         };
     });
 }
-function checkForSelfHostedURL(ctx) {
+function getAppIdFromUrl(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        // the "appId" component of the URL may actually be a specific self hosted URL
+        // the "appId" component of the URL can be the id or the custom url
         let possibleAppUrl = `/${encodeURI(ctx.params.appId).toLowerCase()}`;
-        const apps = yield getDeployedApps();
-        if (apps[possibleAppUrl] && apps[possibleAppUrl].appId) {
-            return apps[possibleAppUrl].appId;
+        // search prod apps for a url that matches, exclude dev where id is always used
+        const apps = yield getAllApps(CouchDB, { dev: false });
+        const app = apps.filter(a => a.url && a.url.toLowerCase() === possibleAppUrl)[0];
+        if (app && app.appId) {
+            return app.appId;
         }
         else {
             return ctx.params.appId;
@@ -82,10 +84,7 @@ exports.uploadFile = function (ctx) {
 };
 exports.serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let appId = ctx.params.appId;
-        if (env.SELF_HOSTED) {
-            appId = yield checkForSelfHostedURL(ctx);
-        }
+        let appId = yield getAppIdFromUrl(ctx);
         const App = require("./templates/BudibaseApp.svelte").default;
         const db = new CouchDB(appId, { skip_setup: true });
         const appInfo = yield db.get(DocumentTypes.APP_METADATA);

package/dist/api/routes/index.js

@@ -21,7 +21,6 @@ const integrationRoutes = require("./integration");
 const permissionRoutes = require("./permission");
 const datasourceRoutes = require("./datasource");
 const queryRoutes = require("./query");
-const hostingRoutes = require("./hosting");
 const backupRoutes = require("./backup");
 const metadataRoutes = require("./metadata");
 const devRoutes = require("./dev");
@@ -46,7 +45,6 @@ exports.mainRoutes = [
     permissionRoutes,
     datasourceRoutes,
     queryRoutes,
-    hostingRoutes,
     backupRoutes,
     metadataRoutes,
     devRoutes,

package/dist/integrations/rest.js

@@ -40,8 +40,8 @@ const coreFields = {
         enum: Object.values(BodyTypes),
     },
     pagination: {
-        type: datasource_1.DatasourceFieldTypes.OBJECT,
-    },
+        type: datasource_1.DatasourceFieldTypes.OBJECT
+    }
 };
 var RestModule;
 (function (RestModule) {
@@ -162,8 +162,8 @@ var RestModule;
                         headers,
                     },
                     pagination: {
-                        cursor: nextCursor,
-                    },
+                        cursor: nextCursor
+                    }
                 };
             });
         }
@@ -294,7 +294,7 @@ var RestModule;
         }
         _req(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId, pagination, paginationValues, } = query;
+                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId, pagination, paginationValues } = query;
                 const authHeaders = this.getAuthHeaders(authConfigId);
                 this.headers = Object.assign(Object.assign(Object.assign({}, this.config.defaultHeaders), headers), authHeaders);
                 if (disabledHeaders) {

package/dist/integrations/s3.js

@@ -38,7 +38,7 @@ var S3Module;
             signatureVersion: {
                 type: "string",
                 required: false,
-                default: "v4",
+                default: "v4"
             },
         },
         query: {

package/dist/integrations/utils.js

@@ -153,7 +153,9 @@ exports.isIsoDateString = isIsoDateString;
  * @param tableIds The IDs of the tables which currently exist.
  */
 function shouldCopyRelationship(column, tableIds) {
-    return column.type === constants_1.FieldTypes.LINK && column.tableId && tableIds.includes(column.tableId);
+    return (column.type === constants_1.FieldTypes.LINK &&
+        column.tableId &&
+        tableIds.includes(column.tableId));
 }
 /**
  * Similar function to the shouldCopyRelationship function, but instead this looks for options and boolean
@@ -164,8 +166,9 @@ function shouldCopyRelationship(column, tableIds) {
  * @param fetchedColumn The fetched column to check for the type in the external database.
  */
 function shouldCopySpecialColumn(column, fetchedColumn) {
-    return column.type === constants_1.FieldTypes.OPTIONS ||
-        ((!fetchedColumn || fetchedColumn.type === constants_1.FieldTypes.NUMBER) && column.type === constants_1.FieldTypes.BOOLEAN);
+    return (column.type === constants_1.FieldTypes.OPTIONS ||
+        ((!fetchedColumn || fetchedColumn.type === constants_1.FieldTypes.NUMBER) &&
+            column.type === constants_1.FieldTypes.BOOLEAN));
 }
 /**
  * Looks for columns which need to be copied over into the new table definitions, like relationships

package/dist/middleware/currentapp.js

@@ -49,15 +49,6 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         !isWebhookEndpoint(ctx) &&
         (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
         clearCookie(ctx, Cookies.CurrentApp);
-        // have to set the return url on the server side as client side is not available
-        setCookie(ctx, ctx.url, Cookies.RETURN_URL, {
-            // don't sign so the browser can easily read
-            sign: false,
-            // use the request domain to match how ui handles the return url cookie.
-            // it's important we don't use the shared domain here as the builder
-            // can't delete from it without awareness of the domain.
-            requestDomain: true,
-        });
         return ctx.redirect("/");
     }
     let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.46-alpha.3",
+    "version": "1.0.46-alpha.4",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.46-alpha.3",
-        "@budibase/client": "^1.0.46-alpha.3",
-        "@budibase/string-templates": "^1.0.46-alpha.3",
+        "@budibase/backend-core": "^1.0.46-alpha.4",
+        "@budibase/client": "^1.0.46-alpha.4",
+        "@budibase/string-templates": "^1.0.46-alpha.4",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -110,7 +110,7 @@
         "mongodb": "3.6.3",
         "mssql": "6.2.3",
         "mysql2": "^2.3.1",
-        "node-fetch": "2.6.0",
+        "node-fetch": "2.6.7",
         "open": "^8.4.0",
         "pg": "8.5.1",
         "pino-pretty": "4.0.0",

package/dist/tests/utilities/TestConfiguration.js

@@ -21,6 +21,7 @@ const { getGlobalDB } = require("@budibase/backend-core/tenancy");
 const { createASession } = require("@budibase/backend-core/sessions");
 const { user: userCache } = require("@budibase/backend-core/cache");
 const CouchDB = require("../../db");
+const newid = require("../../db/newid");
 core.init(CouchDB);
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
@@ -83,7 +84,8 @@ class TestConfiguration {
             return Object.assign({ _rev: resp._rev }, user);
         });
     }
-    init(appName = "test_application") {
+    // use a new id as the name to avoid name collisions
+    init(appName = newid()) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.globalUser();
             return this.createApp(appName);

package/dist/threads/query.js

@@ -75,6 +75,10 @@ class QueryRunner {
                 yield threadUtils.invalidateDynamicVariables(this.cachedVariables);
                 return this.execute();
             }
+            // check for undefined response
+            if (!rows) {
+                rows = [];
+            }
             // needs to an array for next step
             if (!Array.isArray(rows)) {
                 rows = [rows];