npm - @budibase/server - Versions diffs - 2.4.40 → 2.4.42-alpha.0 - Mend

@budibase/server 2.4.40 → 2.4.42-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (75) hide show

package/__mocks__/node-fetch.ts +6 -1
package/builder/assets/index.3cb1022d.css +6 -0
package/builder/assets/{index.07ed2ead.js → index.4b6c8c0e.js} +384 -383
package/builder/index.html +7 -7
package/dist/api/controllers/application.js +28 -24
package/dist/api/controllers/datasource.js +2 -1
package/dist/api/controllers/public/metrics.js +113 -0
package/dist/api/controllers/row/external.js +16 -8
package/dist/api/controllers/row/index.js +11 -1
package/dist/api/controllers/row/internal.js +1 -10
package/dist/api/controllers/row/utils.js +7 -7
package/dist/api/controllers/static/index.js +84 -24
package/dist/api/controllers/static/templates/BudibaseApp.svelte +33 -10
package/dist/api/controllers/table/external.js +16 -12
package/dist/api/controllers/table/utils.js +15 -1
package/dist/api/routes/public/index.js +8 -0
package/dist/api/routes/public/metrics.js +30 -0
package/dist/app.js +1 -0
package/dist/constants/index.js +2 -1
package/dist/integrations/googlesheets.js +125 -59
package/dist/integrations/redis.js +1 -1
package/dist/integrations/utils.js +17 -2
package/dist/package.json +13 -12
package/dist/sdk/users/utils.js +2 -1
package/dist/tsconfig.build.tsbuildinfo +1 -1
package/dist/utilities/global.js +17 -7
package/jest.config.ts +1 -0
package/package.json +14 -13
package/scripts/test.sh +3 -3
package/specs/openapi.json +39 -0
package/specs/openapi.yaml +169 -0
package/specs/resources/application.ts +11 -0
package/specs/resources/index.ts +2 -0
package/specs/resources/metrics.ts +81 -0
package/src/api/controllers/application.ts +20 -21
package/src/api/controllers/datasource.ts +2 -1
package/src/api/controllers/public/metrics.ts +251 -0
package/src/api/controllers/row/external.ts +26 -16
package/src/api/controllers/row/index.ts +12 -2
package/src/api/controllers/row/internal.ts +0 -7
package/src/api/controllers/row/utils.ts +7 -7
package/src/api/controllers/static/index.ts +69 -26
package/src/api/controllers/static/templates/BudibaseApp.svelte +33 -10
package/src/api/controllers/table/external.ts +24 -17
package/src/api/controllers/table/index.ts +9 -9
package/src/api/controllers/table/utils.ts +18 -2
package/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap +48 -48
package/src/api/routes/public/index.ts +10 -1
package/src/api/routes/public/metrics.ts +28 -0
package/src/api/routes/public/tests/metrics.spec.js +34 -0
package/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap +22 -22
package/src/api/routes/tests/__snapshots__/view.spec.js.snap +5 -5
package/src/api/routes/tests/appSync.spec.ts +31 -0
package/src/api/routes/tests/internalSearch.spec.js +8 -7
package/src/app.ts +2 -1
package/src/automations/automationUtils.ts +1 -1
package/src/automations/tests/automation.spec.ts +99 -0
package/src/constants/index.ts +1 -0
package/src/definitions/openapi.ts +15 -0
package/src/integration-test/postgres.spec.ts +46 -52
package/src/integrations/googlesheets.ts +143 -71
package/src/integrations/redis.ts +1 -1
package/src/integrations/tests/googlesheets.spec.ts +13 -13
package/src/integrations/tests/redis.spec.ts +9 -5
package/src/integrations/utils.ts +16 -4
package/src/middleware/currentapp.ts +2 -2
package/src/sdk/users/utils.ts +4 -1
package/src/tests/jestEnv.ts +1 -0
package/src/tests/jestSetup.ts +5 -1
package/src/tests/utilities/TestConfiguration.ts +13 -0
package/src/tests/utilities/structures.ts +13 -1
package/src/utilities/global.ts +21 -9
package/builder/assets/favicon.e7fc7733.png +0 -0
package/builder/assets/index.b0e3aca6.css +0 -6
package/src/automations/tests/automation.spec.js +0 -84

package/builder/index.html CHANGED Viewed

@@ -1,19 +1,19 @@
 <!doctype html>
 <html class="spectrum spectrum--medium spectrum--darkest" lang="en" dir="ltr">
 <head>
 	<meta charset='utf8'>
 	<meta name='viewport' content='width=device-width'>
 	<title>Budibase</title>
-	<link rel='icon' href='/builder/assets/favicon.e7fc7733.png'>
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
-	<link
-		href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
-		rel="stylesheet"
-	/>
-  <script type="module" crossorigin src="/builder/assets/index.07ed2ead.js"></script>
-  <link rel="stylesheet" href="/builder/assets/index.b0e3aca6.css">
+	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
+		rel="stylesheet" />
+  <script type="module" crossorigin src="/builder/assets/index.4b6c8c0e.js"></script>
+  <link rel="stylesheet" href="/builder/assets/index.3cb1022d.css">
 </head>
 <body id="app">
 </body>
 </html>

package/dist/api/controllers/application.js CHANGED Viewed

@@ -320,7 +320,7 @@ function appPostCreate(ctx, app) {
                     });
                 }
                 catch (err) {
-                    if (err.code && err.code === backend_core_1.errors.codes.USAGE_LIMIT_EXCEEDED) {
+                    if (err.code && err.code === backend_core_1.ErrorCode.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
@@ -415,17 +415,19 @@ function revertClient(ctx) {
     });
 }
 exports.revertClient = revertClient;
-const unpublishApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    let appId = ctx.params.appId;
-    appId = backend_core_1.db.getProdAppID(appId);
-    const db = backend_core_1.context.getProdAppDB();
-    const result = yield db.destroy();
-    yield backend_core_1.events.app.unpublished({ appId });
-    // automations only in production
-    yield (0, utils_2.cleanupAutomations)(appId);
-    yield backend_core_1.cache.app.invalidateAppMetadata(appId);
-    return result;
-});
+function unpublishApp(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let appId = ctx.params.appId;
+        appId = backend_core_1.db.getProdAppID(appId);
+        const db = backend_core_1.context.getProdAppDB();
+        const result = yield db.destroy();
+        yield backend_core_1.events.app.unpublished({ appId });
+        // automations only in production
+        yield (0, utils_2.cleanupAutomations)(appId);
+        yield backend_core_1.cache.app.invalidateAppMetadata(appId);
+        return result;
+    });
+}
 function destroyApp(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let appId = ctx.params.appId;
@@ -476,18 +478,20 @@ function destroy(ctx) {
     });
 }
 exports.destroy = destroy;
-const unpublish = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const prodAppId = backend_core_1.db.getProdAppID(ctx.params.appId);
-    const dbExists = yield backend_core_1.db.dbExists(prodAppId);
-    // check app has been published
-    if (!dbExists) {
-        return ctx.throw(400, "App has not been published.");
-    }
-    yield preDestroyApp(ctx);
-    yield unpublishApp(ctx);
-    yield postDestroyApp(ctx);
-    ctx.status = 204;
-});
+function unpublish(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prodAppId = backend_core_1.db.getProdAppID(ctx.params.appId);
+        const dbExists = yield backend_core_1.db.dbExists(prodAppId);
+        // check app has been published
+        if (!dbExists) {
+            return ctx.throw(400, "App has not been published.");
+        }
+        yield preDestroyApp(ctx);
+        yield unpublishApp(ctx);
+        yield postDestroyApp(ctx);
+        ctx.status = 204;
+    });
+}
 exports.unpublish = unpublish;
 function sync(ctx) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/api/controllers/datasource.js CHANGED Viewed

@@ -74,7 +74,8 @@ function buildSchemaFromDb(ctx) {
         setDefaultDisplayColumns(datasource);
         const dbResp = yield db.put(datasource);
         datasource._rev = dbResp.rev;
-        const response = { datasource };
+        const cleanedDatasource = yield sdk_1.default.datasources.removeSecretSingle(datasource);
+        const response = { datasource: cleanedDatasource };
         if (error) {
             response.error = error;
         }

package/dist/api/controllers/public/metrics.js ADDED Viewed

@@ -0,0 +1,113 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToOpenMetrics = exports.fetch = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
+const os_1 = __importDefault(require("os"));
+function fetch(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // *** OPERATING SYSTEM ***
+        const freeMem = os_1.default.freemem();
+        const totalMem = os_1.default.totalmem();
+        const usedMem = totalMem - freeMem;
+        const uptime = os_1.default.uptime();
+        // *** APPS ***
+        const allDatabases = yield backend_core_1.db.getAllDbs();
+        const devAppIDs = yield backend_core_1.db.getDevAppIDs();
+        const prodAppIDs = yield backend_core_1.db.getProdAppIDs();
+        const allAppIds = yield backend_core_1.db.getAllApps({ idsOnly: true });
+        // *** USERS ***
+        const usersObject = yield backend_core_1.users.getAllUserIds();
+        // *** QUOTAS ***
+        const usage = yield pro_1.quotas.getQuotaUsage();
+        const license = yield pro_1.licensing.cache.getCachedLicense();
+        const appsQuotaUsage = usage.usageQuota.apps;
+        const rowsQuotaUsage = usage.usageQuota.rows;
+        const pluginsQuotaUsage = usage.usageQuota.plugins;
+        const userGroupsQuotaUsage = usage.usageQuota.userGroups;
+        const queryQuotaUsage = usage.monthly.current.queries;
+        const automationsQuotaUsage = usage.monthly.current.automations;
+        const appsQuotaLimit = license.quotas.usage.static.apps.value;
+        const rowsQuotaLimit = license.quotas.usage.static.rows.value;
+        const userGroupsQuotaLimit = license.quotas.usage.static.userGroups.value;
+        const pluginsQuotaLimit = license.quotas.usage.static.plugins.value;
+        const queryQuotaLimit = license.quotas.usage.monthly.queries.value;
+        const automationsQuotaLimit = license.quotas.usage.monthly.automations.value;
+        // *** BUILD THE OUTPUT STRING ***
+        var outputString = "";
+        // **** budibase_os_uptime ****
+        outputString += convertToOpenMetrics("budibase_os_uptime", "Time in seconds that the host operating system has been up", "counter", uptime);
+        // **** budibase_os_free_mem ****
+        outputString += convertToOpenMetrics("budibase_os_free_mem", "Bytes of memory free for usage on the host operating system", "gauge", freeMem);
+        // **** budibase_os_total_mem ****
+        outputString += convertToOpenMetrics("budibase_os_total_mem", "Total bytes of memory on the host operating system", "gauge", totalMem);
+        // **** budibase_os_used_mem ****
+        outputString += convertToOpenMetrics("budibase_os_used_mem", "Total bytes of memory in use on the host operating system", "gauge", usedMem);
+        // **** budibase_os_load1 ****
+        outputString += convertToOpenMetrics("budibase_os_load1", "Host operating system load average", "gauge", os_1.default.loadavg()[0]);
+        // **** budibase_os_load5 ****
+        outputString += convertToOpenMetrics("budibase_os_load5", "Host operating system load average", "gauge", os_1.default.loadavg()[1]);
+        // **** budibase_os_load15 ****
+        outputString += convertToOpenMetrics("budibase_os_load15", "Host operating system load average", "gauge", os_1.default.loadavg()[2]);
+        // **** budibase_tenant_user_count ****
+        outputString += convertToOpenMetrics("budibase_tenant_user_count", "The number of users created", "gauge", usersObject.length);
+        // **** budibase_tenant_app_count ****
+        outputString += convertToOpenMetrics("budibase_tenant_app_count", "The number of apps created by a user", "gauge", allAppIds.length);
+        // **** budibase_tenant_production_app_count ****
+        outputString += convertToOpenMetrics("budibase_tenant_production_app_count", "The number of apps a user has published", "gauge", prodAppIDs.length);
+        // **** budibase_tenant_dev_app_count ****
+        outputString += convertToOpenMetrics("budibase_tenant_dev_app_count", "The number of apps a user has unpublished in development", "gauge", devAppIDs.length);
+        // **** budibase_tenant_db_count ****
+        outputString += convertToOpenMetrics("budibase_tenant_db_count", "The number of couchdb databases including global tables such as _users", "gauge", allDatabases.length);
+        // **** budibase_quota_usage_apps ****
+        outputString += convertToOpenMetrics("budibase_quota_usage_apps", "The number of apps created", "gauge", appsQuotaUsage);
+        // **** budibase_quota_limit_apps ****
+        outputString += convertToOpenMetrics("budibase_quota_limit_apps", "The limit on the number of apps that can be created", "gauge", appsQuotaLimit == -1 ? Number.MAX_SAFE_INTEGER : appsQuotaLimit);
+        // **** budibase_quota_usage_rows ****
+        outputString += convertToOpenMetrics("budibase_quota_usage_rows", "The number of database rows used from the quota", "gauge", rowsQuotaUsage);
+        // **** budibase_quota_limit_rows ****
+        outputString += convertToOpenMetrics("budibase_quota_limit_rows", "The limit on the number of rows that can be created", "gauge", rowsQuotaLimit == -1 ? Number.MAX_SAFE_INTEGER : rowsQuotaLimit);
+        // **** budibase_quota_usage_plugins ****
+        outputString += convertToOpenMetrics("budibase_quota_usage_plugins", "The number of plugins in use", "gauge", pluginsQuotaUsage);
+        // **** budibase_quota_limit_plugins ****
+        outputString += convertToOpenMetrics("budibase_quota_limit_plugins", "The limit on the number of plugins that can be created", "gauge", pluginsQuotaLimit == -1 ? Number.MAX_SAFE_INTEGER : pluginsQuotaLimit);
+        // **** budibase_quota_usage_user_groups ****
+        outputString += convertToOpenMetrics("budibase_quota_usage_user_groups", "The number of user groups created", "gauge", userGroupsQuotaUsage);
+        // **** budibase_quota_limit_user_groups ****
+        outputString += convertToOpenMetrics("budibase_quota_limit_user_groups", "The limit on the number of user groups that can be created", "gauge", userGroupsQuotaLimit == -1 ? Number.MAX_SAFE_INTEGER : userGroupsQuotaLimit);
+        // **** budibase_quota_usage_queries ****
+        outputString += convertToOpenMetrics("budibase_quota_usage_queries", "The number of queries used in the current month", "gauge", queryQuotaUsage);
+        // **** budibase_quota_limit_queries ****
+        outputString += convertToOpenMetrics("budibase_quota_limit_queries", "The limit on the number of queries for the current month", "gauge", queryQuotaLimit == -1 ? Number.MAX_SAFE_INTEGER : queryQuotaLimit);
+        // **** budibase_quota_usage_automations ****
+        outputString += convertToOpenMetrics("budibase_quota_usage_automations", "The number of automations used in the current month", "gauge", automationsQuotaUsage);
+        // **** budibase_quota_limit_automations ****
+        outputString += convertToOpenMetrics("budibase_quota_limit_automations", "The limit on the number of automations that can be created", "gauge", automationsQuotaLimit == -1
+            ? Number.MAX_SAFE_INTEGER
+            : automationsQuotaLimit);
+        ctx.body = outputString;
+        ctx.set("Content-Type", "text/plain");
+    });
+}
+exports.fetch = fetch;
+function convertToOpenMetrics(metricName, metricHelp, metricType, metricValue) {
+    return `# HELP ${metricName} ${metricHelp}.
+# TYPE ${metricName} ${metricType}
+${metricName} ${metricValue}\n`;
+}
+exports.convertToOpenMetrics = convertToOpenMetrics;
+exports.default = {
+    fetch,
+};

package/dist/api/controllers/row/external.js CHANGED Viewed

@@ -46,7 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchEnrichedRow = exports.exportRows = exports.validate = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = exports.handleRequest = void 0;
+exports.fetchEnrichedRow = exports.exportRows = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = exports.handleRequest = void 0;
 const constants_1 = require("../../../constants");
 const utils_1 = require("../../../integrations/utils");
 const ExternalRequest_1 = require("./ExternalRequest");
@@ -54,6 +54,7 @@ const exporters = __importStar(require("../view/exporters"));
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const types_1 = require("@budibase/types");
 const sdk_1 = __importDefault(require("../../../sdk"));
+const utils = __importStar(require("./utils"));
 const { cleanExportRows } = require("./utils");
 function handleRequest(operation, tableId, opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -83,6 +84,13 @@ function patch(ctx) {
         const id = inputs._id;
         // don't save the ID to db
         delete inputs._id;
+        const validateResult = yield utils.validate({
+            row: inputs,
+            tableId,
+        });
+        if (!validateResult.valid) {
+            throw { validation: validateResult.errors };
+        }
         return handleRequest(types_1.Operation.UPDATE, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
             row: inputs,
@@ -95,6 +103,13 @@ function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const inputs = ctx.request.body;
         const tableId = ctx.params.tableId;
+        const validateResult = yield utils.validate({
+            row: inputs,
+            tableId,
+        });
+        if (!validateResult.valid) {
+            throw { validation: validateResult.errors };
+        }
         return handleRequest(types_1.Operation.CREATE, tableId, {
             row: inputs,
             includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
@@ -225,13 +240,6 @@ function search(ctx) {
     });
 }
 exports.search = search;
-function validate(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // can't validate external right now - maybe in future
-        return { valid: true };
-    });
-}
-exports.validate = validate;
 function exportRows(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { datasourceId, tableName } = (0, utils_1.breakExternalTableId)(ctx.params.tableId);

package/dist/api/controllers/row/index.js CHANGED Viewed

@@ -37,6 +37,7 @@ const pro_1 = require("@budibase/pro");
 const internal = __importStar(require("./internal"));
 const external = __importStar(require("./external"));
 const utils_1 = require("../../../integrations/utils");
+const utils = __importStar(require("./utils"));
 function pickApi(tableId) {
     if ((0, utils_1.isExternalTable)(tableId)) {
         return external;
@@ -171,7 +172,16 @@ exports.search = search;
 function validate(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
-        ctx.body = yield pickApi(tableId).validate(ctx);
+        // external tables are hard to validate currently
+        if ((0, utils_1.isExternalTable)(tableId)) {
+            ctx.body = { valid: true };
+        }
+        else {
+            ctx.body = yield utils.validate({
+                row: ctx.request.body,
+                tableId,
+            });
+        }
     });
 }
 exports.validate = validate;

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

@@ -46,7 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchEnrichedRow = exports.exportRows = exports.validate = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = void 0;
+exports.fetchEnrichedRow = exports.exportRows = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = void 0;
 const linkRows = __importStar(require("../../../db/linkedRows"));
 const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
@@ -392,15 +392,6 @@ function search(ctx) {
     });
 }
 exports.search = search;
-function validate(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return utils.validate({
-            tableId: ctx.params.tableId,
-            row: ctx.request.body,
-        });
-    });
-}
-exports.validate = validate;
 function exportRows(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();

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

@@ -41,10 +41,10 @@ const userController = __importStar(require("../user"));
 const constants_1 = require("../../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 const query_1 = require("../../../integrations/base/query");
-const validateJs = require("validate.js");
-const { cloneDeep } = require("lodash/fp");
 const exporters_1 = require("../view/exporters");
 const sdk_1 = __importDefault(require("../../../sdk"));
+const validateJs = require("validate.js");
+const { cloneDeep } = require("lodash/fp");
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -88,18 +88,18 @@ function validate({ tableId, row, table, }) {
     return __awaiter(this, void 0, void 0, function* () {
         let fetchedTable;
         if (!table) {
-            const db = backend_core_1.context.getAppDB();
-            fetchedTable = yield db.get(tableId);
+            fetchedTable = yield sdk_1.default.tables.getTable(tableId);
         }
         else {
             fetchedTable = table;
         }
         const errors = {};
         for (let fieldName of Object.keys(fetchedTable.schema)) {
-            const constraints = cloneDeep(fetchedTable.schema[fieldName].constraints);
-            const type = fetchedTable.schema[fieldName].type;
+            const column = fetchedTable.schema[fieldName];
+            const constraints = cloneDeep(column.constraints);
+            const type = column.type;
             // formulas shouldn't validated, data will be deleted anyway
-            if (type === constants_1.FieldTypes.FORMULA) {
+            if (type === constants_1.FieldTypes.FORMULA || column.autocolumn) {
                 continue;
             }
             // special case for options, need to always allow unselected (null)

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

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -25,6 +48,7 @@ const backend_core_1 = require("@budibase/backend-core");
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const fs_1 = __importDefault(require("fs"));
 const sdk_1 = __importDefault(require("../../../sdk"));
+const pro = __importStar(require("@budibase/pro"));
 const send = require("koa-send");
 function prepareUpload({ s3Key, bucket, metadata, file }) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -102,31 +126,67 @@ const deleteObjects = function (ctx) {
 exports.deleteObjects = deleteObjects;
 const serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB({ skip_setup: true });
-        const appInfo = yield db.get(utils_1.DocumentType.APP_METADATA);
-        let appId = backend_core_1.context.getAppId();
-        if (!environment_1.default.isJest()) {
-            const App = require("./templates/BudibaseApp.svelte").default;
-            const plugins = backend_core_1.objectStore.enrichPluginURLs(appInfo.usedPlugins);
-            const { head, html, css } = App.render({
-                metaImage: "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
-                title: appInfo.name,
-                production: environment_1.default.isProd(),
-                appId,
-                clientLibPath: backend_core_1.objectStore.clientLibraryUrl(appId, appInfo.version),
-                usedPlugins: plugins,
-            });
-            const appHbs = (0, fileSystem_1.loadHandlebarsFile)(`${__dirname}/templates/app.hbs`);
-            ctx.body = yield (0, string_templates_1.processString)(appHbs, {
-                head,
-                body: html,
-                style: css.code,
-                appId,
-            });
+        //Public Settings
+        const { config } = yield backend_core_1.configs.getSettingsConfigDoc();
+        const branding = yield pro.branding.getBrandingConfig(config);
+        let db;
+        try {
+            db = backend_core_1.context.getAppDB({ skip_setup: true });
+            const appInfo = yield db.get(utils_1.DocumentType.APP_METADATA);
+            let appId = backend_core_1.context.getAppId();
+            if (!environment_1.default.isJest()) {
+                const App = require("./templates/BudibaseApp.svelte").default;
+                const plugins = backend_core_1.objectStore.enrichPluginURLs(appInfo.usedPlugins);
+                const { head, html, css } = App.render({
+                    metaImage: (branding === null || branding === void 0 ? void 0 : branding.metaImageUrl) ||
+                        "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
+                    metaDescription: (branding === null || branding === void 0 ? void 0 : branding.metaDescription) || "",
+                    metaTitle: (branding === null || branding === void 0 ? void 0 : branding.metaTitle) || `${appInfo.name} - built with Budibase`,
+                    title: appInfo.name,
+                    production: environment_1.default.isProd(),
+                    appId,
+                    clientLibPath: backend_core_1.objectStore.clientLibraryUrl(appId, appInfo.version),
+                    usedPlugins: plugins,
+                    favicon: branding.faviconUrl !== ""
+                        ? backend_core_1.objectStore.getGlobalFileUrl("settings", "faviconUrl")
+                        : "",
+                    logo: (config === null || config === void 0 ? void 0 : config.logoUrl) !== ""
+                        ? backend_core_1.objectStore.getGlobalFileUrl("settings", "logoUrl")
+                        : "",
+                });
+                const appHbs = (0, fileSystem_1.loadHandlebarsFile)(`${__dirname}/templates/app.hbs`);
+                ctx.body = yield (0, string_templates_1.processString)(appHbs, {
+                    head,
+                    body: html,
+                    style: css.code,
+                    appId,
+                });
+            }
+            else {
+                // just return the app info for jest to assert on
+                ctx.body = appInfo;
+            }
         }
-        else {
-            // just return the app info for jest to assert on
-            ctx.body = appInfo;
+        catch (error) {
+            if (!environment_1.default.isJest()) {
+                const App = require("./templates/BudibaseApp.svelte").default;
+                const { head, html, css } = App.render({
+                    title: branding === null || branding === void 0 ? void 0 : branding.metaTitle,
+                    metaTitle: branding === null || branding === void 0 ? void 0 : branding.metaTitle,
+                    metaImage: (branding === null || branding === void 0 ? void 0 : branding.metaImageUrl) ||
+                        "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
+                    metaDescription: (branding === null || branding === void 0 ? void 0 : branding.metaDescription) || "",
+                    favicon: branding.faviconUrl !== ""
+                        ? backend_core_1.objectStore.getGlobalFileUrl("settings", "faviconUrl")
+                        : "",
+                });
+                const appHbs = (0, fileSystem_1.loadHandlebarsFile)(`${__dirname}/templates/app.hbs`);
+                ctx.body = yield (0, string_templates_1.processString)(appHbs, {
+                    head,
+                    body: html,
+                    style: css.code,
+                });
+            }
         }
     });
 };

package/dist/api/controllers/static/templates/BudibaseApp.svelte CHANGED Viewed

@@ -1,7 +1,10 @@
 <script>
   export let title = ""
   export let favicon = ""
   export let metaImage = ""
+  export let metaTitle = ""
+  export let metaDescription = ""
   export let clientLibPath
   export let usedPlugins
@@ -13,18 +16,33 @@
     name="viewport"
     content="width=device-width, initial-scale=1.0, viewport-fit=cover"
   />
+  <!-- Primary Meta Tags -->
+  <meta name="title" content={metaTitle} />
+  <meta name="description" content={metaDescription} />
   <!-- Opengraph Meta Tags -->
-  <meta name="twitter:card" content="summary_large_image" />
-  <meta name="twitter:site" content="@budibase" />
-  <meta name="twitter:image" content={metaImage} />
-  <meta name="twitter:title" content="{title} - built with Budibase" />
   <meta property="og:site_name" content="Budibase" />
   <meta property="og:title" content="{title} - built with Budibase" />
+  <meta property="og:description" content={metaDescription} />
   <meta property="og:type" content="website" />
   <meta property="og:image" content={metaImage} />
+  <!-- Twitter -->
+  <meta property="twitter:card" content="summary_large_image" />
+  <meta property="twitter:site" content="@budibase" />
+  <meta property="twitter:image" content={metaImage} />
+  <meta property="twitter:image:alt" content="{title} - built with Budibase" />
+  <meta property="twitter:title" content="{title} - built with Budibase" />
+  <meta property="twitter:description" content={metaDescription} />
   <title>{title}</title>
-  <link rel="icon" type="image/png" href={favicon} />
+  {#if favicon !== ""}
+    <link rel="icon" type="image/png" href={favicon} />
+  {:else}
+    <link rel="icon" type="image/png" href="https://i.imgur.com/Xhdt1YP.png" />
+  {/if}
   <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
   <link rel="preconnect" href="https://fonts.gstatic.com" />
   <link
@@ -83,11 +101,16 @@
 <body id="app">
   <div id="error">
-    <h1>There was an error loading your app</h1>
-    <h2>
-      The Budibase client library could not be loaded. Try republishing your
-      app.
-    </h2>
+    {#if clientLibPath}
+      <h1>There was an error loading your app</h1>
+      <h2>
+        The Budibase client library could not be loaded. Try republishing your
+        app.
+      </h2>
+    {:else}
+      <h2>We couldn't find that application</h2>
+      <p />
+    {/if}
   </div>
   <script type="application/javascript">
     window.INIT_TIME = Date.now()