@budibase/server 2.1.45 → 2.1.46-alpha.1

package/dist/utilities/global.js

@@ -8,49 +8,54 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getMultiIDParams, getGlobalIDFromUserMetadataID, } = require("../db/utils");
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { getProdAppID } = require("@budibase/backend-core/db");
-const { getGlobalUserParams } = require("@budibase/backend-core/db");
-const { user: userCache } = require("@budibase/backend-core/cache");
-const { getGlobalDB, isUserInAppTenant, } = require("@budibase/backend-core/tenancy");
-const env = require("../environment");
-const { getAppId } = require("@budibase/backend-core/context");
-const { groups } = require("@budibase/pro");
-exports.updateAppRole = (user, { appId } = {}) => {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalUsersFromMetadata = exports.getGlobalUsers = exports.getGlobalUser = exports.getRawGlobalUser = exports.getCachedSelf = exports.updateAppRole = void 0;
+const utils_1 = require("../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const environment_1 = __importDefault(require("../environment"));
+const pro_1 = require("@budibase/pro");
+function updateAppRole(user, { appId } = {}) {
     var _a, _b;
-    appId = appId || getAppId();
+    appId = appId || backend_core_1.context.getAppId();
     if (!user || !user.roles) {
         return user;
     }
     // if in an multi-tenancy environment make sure roles are never updated
-    if (env.MULTI_TENANCY && !isUserInAppTenant(appId, user)) {
+    if (environment_1.default.MULTI_TENANCY && appId && !backend_core_1.tenancy.isUserInAppTenant(appId, user)) {
         delete user.builder;
         delete user.admin;
-        user.roleId = BUILTIN_ROLE_IDS.PUBLIC;
+        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
         return user;
     }
     // always use the deployed app
-    user.roleId = user.roles[getProdAppID(appId)];
+    if (appId) {
+        user.roleId = user.roles[backend_core_1.db.getProdAppID(appId)];
+    }
     // if a role wasn't found then either set as admin (builder) or public (everyone else)
     if (!user.roleId && user.builder && user.builder.global) {
-        user.roleId = BUILTIN_ROLE_IDS.ADMIN;
+        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.ADMIN;
     }
     else if (!user.roleId && !((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
-        user.roleId = BUILTIN_ROLE_IDS.PUBLIC;
+        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
     }
     else if ((_b = user === null || user === void 0 ? void 0 : user.userGroups) === null || _b === void 0 ? void 0 : _b.length) {
-        user.roleId = null;
+        user.roleId = undefined;
     }
     delete user.roles;
     return user;
-};
+}
+exports.updateAppRole = updateAppRole;
 function checkGroupRoles(user, { appId } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (user.roleId && user.roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
+        if (user.roleId && user.roleId !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
             return user;
         }
-        user.roleId = yield groups.getGroupRoleId(user, appId);
+        if (appId) {
+            user.roleId = yield pro_1.groups.getGroupRoleId(user, appId);
+        }
         return user;
     });
 }
@@ -60,57 +65,73 @@ function processUser(user, { appId } = {}) {
         if (user) {
             delete user.password;
         }
-        user = yield exports.updateAppRole(user, { appId });
+        user = yield updateAppRole(user, { appId });
         if (!user.roleId && ((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
             user = yield checkGroupRoles(user, { appId });
         }
         return user;
     });
 }
-exports.getCachedSelf = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    // this has to be tenant aware, can't depend on the context to find it out
-    // running some middlewares before the tenancy causes context to break
-    const user = yield userCache.getUser(ctx.user._id);
-    return processUser(user, { appId });
-});
-exports.getRawGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getGlobalDB();
-    return db.get(getGlobalIDFromUserMetadataID(userId));
-});
-exports.getGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = getAppId();
-    let user = yield exports.getRawGlobalUser(userId);
-    return processUser(user, { appId });
-});
-exports.getGlobalUsers = (users = null) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = getAppId();
-    const db = getGlobalDB();
-    let globalUsers;
-    if (users) {
-        const globalIds = users.map(user => getGlobalIDFromUserMetadataID(user._id));
-        globalUsers = (yield db.allDocs(getMultiIDParams(globalIds))).rows.map(row => row.doc);
-    }
-    else {
-        globalUsers = (yield db.allDocs(getGlobalUserParams(null, {
-            include_docs: true,
-        }))).rows.map(row => row.doc);
-    }
-    globalUsers = globalUsers
-        .filter(user => user != null)
-        .map(user => {
-        delete user.password;
-        delete user.forceResetPassword;
-        return user;
+function getCachedSelf(ctx, appId) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        // this has to be tenant aware, can't depend on the context to find it out
+        // running some middlewares before the tenancy causes context to break
+        const user = yield backend_core_1.cache.user.getUser((_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id);
+        return processUser(user, { appId });
     });
-    if (!appId) {
-        return globalUsers;
-    }
-    return globalUsers.map(user => exports.updateAppRole(user));
-});
-exports.getGlobalUsersFromMetadata = (users) => __awaiter(void 0, void 0, void 0, function* () {
-    const globalUsers = yield exports.getGlobalUsers(users);
-    return users.map(user => {
-        const globalUser = globalUsers.find(globalUser => globalUser && user._id.includes(globalUser._id));
-        return Object.assign(Object.assign({}, globalUser), user);
+}
+exports.getCachedSelf = getCachedSelf;
+function getRawGlobalUser(userId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.tenancy.getGlobalDB();
+        return db.get((0, utils_1.getGlobalIDFromUserMetadataID)(userId));
+    });
+}
+exports.getRawGlobalUser = getRawGlobalUser;
+function getGlobalUser(userId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appId = backend_core_1.context.getAppId();
+        let user = yield getRawGlobalUser(userId);
+        return processUser(user, { appId });
+    });
+}
+exports.getGlobalUser = getGlobalUser;
+function getGlobalUsers(users) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appId = backend_core_1.context.getAppId();
+        const db = backend_core_1.tenancy.getGlobalDB();
+        let globalUsers;
+        if (users) {
+            const globalIds = users.map(user => (0, utils_1.getGlobalIDFromUserMetadataID)(user._id));
+            globalUsers = (yield db.allDocs((0, utils_1.getMultiIDParams)(globalIds))).rows.map(row => row.doc);
+        }
+        else {
+            globalUsers = (yield db.allDocs(backend_core_1.db.getGlobalUserParams(null, {
+                include_docs: true,
+            }))).rows.map(row => row.doc);
+        }
+        globalUsers = globalUsers
+            .filter(user => user != null)
+            .map(user => {
+            delete user.password;
+            delete user.forceResetPassword;
+            return user;
+        });
+        if (!appId) {
+            return globalUsers;
+        }
+        return globalUsers.map(user => updateAppRole(user));
     });
-});
+}
+exports.getGlobalUsers = getGlobalUsers;
+function getGlobalUsersFromMetadata(users) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const globalUsers = yield getGlobalUsers(users);
+        return users.map(user => {
+            const globalUser = globalUsers.find(globalUser => { var _a; return globalUser && ((_a = user._id) === null || _a === void 0 ? void 0 : _a.includes(globalUser._id)); });
+            return Object.assign(Object.assign({}, globalUser), user);
+        });
+    });
+}
+exports.getGlobalUsersFromMetadata = getGlobalUsersFromMetadata;

package/dist/utilities/index.js

@@ -8,44 +8,55 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const env = require("../environment");
-const { OBJ_STORE_DIRECTORY } = require("../constants");
-const { sanitizeKey } = require("@budibase/backend-core/objectStore");
-const { generateMetadataID } = require("../db/utils");
-const Readable = require("stream").Readable;
-const { getAppDB } = require("@budibase/backend-core/context");
-exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms));
-exports.isDev = env.isDev;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isQsTrue = exports.convertBookmark = exports.formatBytes = exports.stringToReadStream = exports.escapeDangerousCharacters = exports.deleteEntityMetadata = exports.saveEntityMetadata = exports.updateEntityMetadata = exports.attachmentsRelativeURL = exports.clientLibraryPath = exports.objectStoreUrl = exports.checkSlashesInUrl = exports.removeFromArray = exports.NUMBER_REGEX = exports.isDev = exports.wait = void 0;
+const environment_1 = __importDefault(require("../environment"));
+const constants_1 = require("../constants");
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../db/utils");
+const stream_1 = __importDefault(require("stream"));
+const Readable = stream_1.default.Readable;
+function wait(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+exports.wait = wait;
+exports.isDev = environment_1.default.isDev;
 exports.NUMBER_REGEX = /^[+-]?([0-9]*[.])?[0-9]+$/g;
-exports.removeFromArray = (array, element) => {
+function removeFromArray(array, element) {
     const index = array.indexOf(element);
     if (index !== -1) {
         array.splice(index, 1);
     }
     return array;
-};
+}
+exports.removeFromArray = removeFromArray;
 /**
  * Makes sure that a URL has the correct number of slashes, while maintaining the
  * http(s):// double slashes.
  * @param {string} url The URL to test and remove any extra double slashes.
  * @return {string} The updated url.
  */
-exports.checkSlashesInUrl = url => {
+function checkSlashesInUrl(url) {
     return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2");
-};
+}
+exports.checkSlashesInUrl = checkSlashesInUrl;
 /**
  * Gets the address of the object store, depending on whether self hosted or in cloud.
  * @return {string} The base URL of the object store (MinIO or S3).
  */
-exports.objectStoreUrl = () => {
-    if (env.SELF_HOSTED || env.MINIO_URL) {
+function objectStoreUrl() {
+    if (environment_1.default.SELF_HOSTED || environment_1.default.MINIO_URL) {
         // can use a relative url for this as all goes through the proxy (this is hosted in minio)
-        return OBJ_STORE_DIRECTORY;
+        return constants_1.OBJ_STORE_DIRECTORY;
     }
     else {
-        return env.CDN_URL;
+        return environment_1.default.CDN_URL;
     }
-};
+}
+exports.objectStoreUrl = objectStoreUrl;
 /**
  * In production the client library is stored in the object store, however in development
  * we use the symlinked version produced by lerna, located in node modules. We link to this
@@ -56,9 +67,9 @@ exports.objectStoreUrl = () => {
  * @return {string} The URL to be inserted into appPackage response or server rendered
  * app index file.
  */
-exports.clientLibraryPath = (appId, version) => {
-    if (env.isProd()) {
-        let url = `${exports.objectStoreUrl()}/${sanitizeKey(appId)}/budibase-client.js`;
+function clientLibraryPath(appId, version) {
+    if (environment_1.default.isProd()) {
+        let url = `${objectStoreUrl()}/${backend_core_1.objectStore.sanitizeKey(appId)}/budibase-client.js`;
         // append app version to bust the cache
         if (version) {
             url += `?v=${version}`;
@@ -68,54 +79,65 @@ exports.clientLibraryPath = (appId, version) => {
     else {
         return `/api/assets/client`;
     }
-};
-exports.attachmentsRelativeURL = attachmentKey => {
-    return exports.checkSlashesInUrl(`${exports.objectStoreUrl()}/${attachmentKey}`);
-};
-exports.updateEntityMetadata = (type, entityId, updateFn) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const id = generateMetadataID(type, entityId);
-    // read it to see if it exists, we'll overwrite it no matter what
-    let rev, metadata = {};
-    try {
-        const oldMetadata = yield db.get(id);
-        rev = oldMetadata._rev;
-        metadata = updateFn(oldMetadata);
-    }
-    catch (err) {
-        rev = null;
-        metadata = updateFn({});
-    }
-    metadata._id = id;
-    if (rev) {
-        metadata._rev = rev;
-    }
-    const response = yield db.put(metadata);
-    return Object.assign(Object.assign({}, metadata), { _id: id, _rev: response.rev });
-});
-exports.saveEntityMetadata = (type, entityId, metadata) => __awaiter(void 0, void 0, void 0, function* () {
-    return exports.updateEntityMetadata(type, entityId, () => {
-        return metadata;
+}
+exports.clientLibraryPath = clientLibraryPath;
+function attachmentsRelativeURL(attachmentKey) {
+    return checkSlashesInUrl(`${objectStoreUrl()}/${attachmentKey}`);
+}
+exports.attachmentsRelativeURL = attachmentsRelativeURL;
+function updateEntityMetadata(type, entityId, updateFn) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
+        const id = (0, utils_1.generateMetadataID)(type, entityId);
+        // read it to see if it exists, we'll overwrite it no matter what
+        let rev, metadata;
+        try {
+            const oldMetadata = yield db.get(id);
+            rev = oldMetadata._rev;
+            metadata = updateFn(oldMetadata);
+        }
+        catch (err) {
+            rev = null;
+            metadata = updateFn({});
+        }
+        metadata._id = id;
+        if (rev) {
+            metadata._rev = rev;
+        }
+        const response = yield db.put(metadata);
+        return Object.assign(Object.assign({}, metadata), { _id: id, _rev: response.rev });
     });
-});
-exports.deleteEntityMetadata = (type, entityId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const id = generateMetadataID(type, entityId);
-    let rev;
-    try {
-        const metadata = yield db.get(id);
-        if (metadata) {
-            rev = metadata._rev;
+}
+exports.updateEntityMetadata = updateEntityMetadata;
+function saveEntityMetadata(type, entityId, metadata) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return updateEntityMetadata(type, entityId, () => {
+            return metadata;
+        });
+    });
+}
+exports.saveEntityMetadata = saveEntityMetadata;
+function deleteEntityMetadata(type, entityId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
+        const id = (0, utils_1.generateMetadataID)(type, entityId);
+        let rev;
+        try {
+            const metadata = yield db.get(id);
+            if (metadata) {
+                rev = metadata._rev;
+            }
         }
-    }
-    catch (err) {
-        // don't need to error if it doesn't exist
-    }
-    if (id && rev) {
-        yield db.remove(id, rev);
-    }
-});
-exports.escapeDangerousCharacters = string => {
+        catch (err) {
+            // don't need to error if it doesn't exist
+        }
+        if (id && rev) {
+            yield db.remove(id, rev);
+        }
+    });
+}
+exports.deleteEntityMetadata = deleteEntityMetadata;
+function escapeDangerousCharacters(string) {
     return string
         .replace(/[\\]/g, "\\\\")
         .replace(/[\b]/g, "\\b")
@@ -123,16 +145,18 @@ exports.escapeDangerousCharacters = string => {
         .replace(/[\n]/g, "\\n")
         .replace(/[\r]/g, "\\r")
         .replace(/[\t]/g, "\\t");
-};
-exports.stringToReadStream = string => {
+}
+exports.escapeDangerousCharacters = escapeDangerousCharacters;
+function stringToReadStream(string) {
     return new Readable({
         read() {
             this.push(string);
             this.push(null);
         },
     });
-};
-exports.formatBytes = bytes => {
+}
+exports.stringToReadStream = stringToReadStream;
+function formatBytes(bytes) {
     const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
     const byteIncrements = 1024;
     let unit = 0;
@@ -141,19 +165,22 @@ exports.formatBytes = bytes => {
         size /= byteIncrements;
     }
     return `${size.toFixed(size < 10 && unit > 0 ? 1 : 0)}${units[unit]}`;
-};
-exports.convertBookmark = bookmark => {
+}
+exports.formatBytes = formatBytes;
+function convertBookmark(bookmark) {
     const IS_NUMBER = /^\d+\.?\d*$/;
     if (typeof bookmark === "string" && bookmark.match(IS_NUMBER)) {
         return parseFloat(bookmark);
     }
     return bookmark;
-};
-exports.isQsTrue = param => {
+}
+exports.convertBookmark = convertBookmark;
+function isQsTrue(param) {
     if (typeof param === "string") {
         return param.toLowerCase() === "true";
     }
     else {
         return param === true;
     }
-};
+}
+exports.isQsTrue = isQsTrue;

package/dist/utilities/plugins.js

@@ -1,20 +1,26 @@
 "use strict";
-const env = require("../environment");
-const { plugins: ProPlugins } = require("@budibase/pro");
-const { objectStore } = require("@budibase/backend-core");
-exports.enrichPluginURLs = plugins => {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enrichPluginURLs = void 0;
+const environment_1 = __importDefault(require("../environment"));
+const pro_1 = require("@budibase/pro");
+const backend_core_1 = require("@budibase/backend-core");
+function enrichPluginURLs(plugins) {
     if (!plugins || !plugins.length) {
         return [];
     }
     return plugins.map(plugin => {
-        const cloud = !env.SELF_HOSTED;
-        const bucket = objectStore.ObjectStoreBuckets.PLUGINS;
+        const cloud = !environment_1.default.SELF_HOSTED;
+        const bucket = backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS;
         const jsFileName = "plugin.min.js";
         // In self host we need to prefix the path, as the bucket name is not part
         // of the bucket path. In cloud, it's already part of the bucket path.
-        let jsUrl = cloud ? `${env.CDN_URL}/` : `/${bucket}/`;
-        jsUrl += ProPlugins.getBucketPath(plugin.name);
+        let jsUrl = cloud ? `${environment_1.default.CDN_URL}/` : `/${bucket}/`;
+        jsUrl += pro_1.plugins.getBucketPath(plugin.name);
         jsUrl += jsFileName;
         return Object.assign(Object.assign({}, plugin), { jsUrl });
     });
-};
+}
+exports.enrichPluginURLs = enrichPluginURLs;