@budibase/server 2.1.32-alpha.5 → 2.1.32-alpha.7

package/dist/tests/utilities/TestConfiguration.js

@@ -9,21 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 require("../../db").init();
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const env = require("../../environment");
 const { basicTable, basicRow, basicRole, basicAutomation, basicDatasource, basicQuery, basicScreen, basicLayout, basicWebhook, TENANT_ID, } = require("./structures");
+const { constants, tenancy, sessions, cache, context, db: dbCore, encryption, auth, roles, } = require("@budibase/backend-core");
 const controllers = require("./controllers");
 const supertest = require("supertest");
 const { cleanup } = require("../../utilities/fileSystem");
-const { Cookie, Header } = require("@budibase/backend-core/constants");
-const { jwt } = require("@budibase/backend-core/auth");
-const { doInTenant, doWithGlobalDB } = require("@budibase/backend-core/tenancy");
-const { createASession } = require("@budibase/backend-core/sessions");
-const { user: userCache } = require("@budibase/backend-core/cache");
 const newid = require("../../db/newid");
-const context = require("@budibase/backend-core/context");
-const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db");
-const { encrypt } = require("@budibase/backend-core/encryption");
 const { DocumentType, generateUserMetadataID } = require("../../db/utils");
 const { startup } = require("../../startup");
 const GLOBAL_USER_ID = "us_uuid1";
@@ -75,7 +67,7 @@ class TestConfiguration {
             if (!appId) {
                 appId = this.appId;
             }
-            return doInTenant(TENANT_ID, () => {
+            return tenancy.doInTenant(TENANT_ID, () => {
                 // check if already in a context
                 if (context.getAppId() == null && appId !== null) {
                     return context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
@@ -139,7 +131,7 @@ class TestConfiguration {
     // USER / AUTH
     globalUser({ id = GLOBAL_USER_ID, firstName = FIRSTNAME, lastName = LASTNAME, builder = true, admin = false, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+            return tenancy.doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
                 let existing;
                 try {
                     existing = yield db.get(id);
@@ -149,7 +141,7 @@ class TestConfiguration {
                 }
                 const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID, firstName,
                     lastName });
-                yield createASession(id, {
+                yield sessions.createASession(id, {
                     sessionId: "sessionid",
                     tenantId: TENANT_ID,
                     csrfToken: CSRF_TOKEN,
@@ -183,7 +175,7 @@ class TestConfiguration {
                 admin,
                 roles,
             });
-            yield userCache.invalidateUser(globalId);
+            yield cache.user.invalidateUser(globalId);
             return Object.assign(Object.assign({}, resp), { globalId });
         });
     }
@@ -196,19 +188,19 @@ class TestConfiguration {
                     throw "Server has not been opened, cannot login.";
                 }
                 // make sure the user exists in the global DB
-                if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
+                if (roleId !== roles.BUILTIN_ROLE_IDS.PUBLIC) {
                     yield this.globalUser({
                         id: userId,
                         builder,
                         roles: { [this.prodAppId]: roleId },
                     });
                 }
-                yield createASession(userId, {
+                yield sessions.createASession(userId, {
                     sessionId: "sessionid",
                     tenantId: TENANT_ID,
                 });
                 // have to fake this
-                const auth = {
+                const authObj = {
                     userId,
                     sessionId: "sessionid",
                     tenantId: TENANT_ID,
@@ -217,39 +209,39 @@ class TestConfiguration {
                     roleId: roleId,
                     appId,
                 };
-                const authToken = jwt.sign(auth, env.JWT_SECRET);
-                const appToken = jwt.sign(app, env.JWT_SECRET);
+                const authToken = auth.jwt.sign(authObj, env.JWT_SECRET);
+                const appToken = auth.jwt.sign(app, env.JWT_SECRET);
                 // returning necessary request headers
-                yield userCache.invalidateUser(userId);
+                yield cache.user.invalidateUser(userId);
                 return {
                     Accept: "application/json",
                     Cookie: [
-                        `${Cookie.Auth}=${authToken}`,
-                        `${Cookie.CurrentApp}=${appToken}`,
+                        `${constants.Cookie.Auth}=${authToken}`,
+                        `${constants.Cookie.CurrentApp}=${appToken}`,
                     ],
-                    [Header.APP_ID]: appId,
+                    [constants.Header.APP_ID]: appId,
                 };
             }));
         });
     }
     defaultHeaders(extras = {}) {
-        const auth = {
+        const authObj = {
             userId: GLOBAL_USER_ID,
             sessionId: "sessionid",
             tenantId: TENANT_ID,
         };
         const app = {
-            roleId: BUILTIN_ROLE_IDS.ADMIN,
+            roleId: roles.BUILTIN_ROLE_IDS.ADMIN,
             appId: this.appId,
         };
-        const authToken = jwt.sign(auth, env.JWT_SECRET);
-        const appToken = jwt.sign(app, env.JWT_SECRET);
+        const authToken = auth.jwt.sign(authObj, env.JWT_SECRET);
+        const appToken = auth.jwt.sign(app, env.JWT_SECRET);
         const headers = Object.assign({ Accept: "application/json", Cookie: [
-                `${Cookie.Auth}=${authToken}`,
-                `${Cookie.CurrentApp}=${appToken}`,
-            ], [Header.CSRF_TOKEN]: CSRF_TOKEN }, extras);
+                `${constants.Cookie.Auth}=${authToken}`,
+                `${constants.Cookie.CurrentApp}=${appToken}`,
+            ], [constants.Header.CSRF_TOKEN]: CSRF_TOKEN }, extras);
         if (this.appId) {
-            headers[Header.APP_ID] = this.appId;
+            headers[constants.Header.APP_ID] = this.appId;
         }
         return headers;
     }
@@ -259,11 +251,11 @@ class TestConfiguration {
             Accept: "application/json",
         };
         if (appId) {
-            headers[Header.APP_ID] = appId;
+            headers[constants.Header.APP_ID] = appId;
         }
         return headers;
     }
-    roleHeaders({ email = EMAIL, roleId = BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
+    roleHeaders({ email = EMAIL, roleId = roles.BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.login({ email, roleId, builder, prodApp });
         });
@@ -271,8 +263,8 @@ class TestConfiguration {
     // API
     generateApiKey(userId = GLOBAL_USER_ID) {
         return __awaiter(this, void 0, void 0, function* () {
-            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
-                const id = generateDevInfoID(userId);
+            return tenancy.doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+                const id = dbCore.generateDevInfoID(userId);
                 let devInfo;
                 try {
                     devInfo = yield db.get(id);
@@ -280,7 +272,7 @@ class TestConfiguration {
                 catch (err) {
                     devInfo = { _id: id, userId };
                 }
-                devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
+                devInfo.apiKey = encryption.encrypt(`${TENANT_ID}${dbCore.SEPARATOR}${newid()}`);
                 yield db.put(devInfo);
                 return devInfo.apiKey;
             }));

package/dist/tests/utilities/structures.js

@@ -1,6 +1,5 @@
 "use strict";
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { BuiltinPermissionID } = require("@budibase/backend-core/permissions");
+const { roles, permissions } = require("@budibase/backend-core");
 const { createHomeScreen } = require("../../constants/screens");
 const { EMPTY_LAYOUT } = require("../../constants/layouts");
 const { cloneDeep } = require("lodash/fp");
@@ -100,8 +99,8 @@ exports.basicLinkedRow = (tableId, linkedRowId, linkField = "link") => {
 exports.basicRole = () => {
     return {
         name: "NewRole",
-        inherits: BUILTIN_ROLE_IDS.BASIC,
-        permissionId: BuiltinPermissionID.READ_ONLY,
+        inherits: roles.BUILTIN_ROLE_IDS.BASIC,
+        permissionId: permissions.BuiltinPermissionID.READ_ONLY,
     };
 };
 exports.basicDatasource = () => {

package/dist/threads/automation.js

@@ -25,15 +25,14 @@ const constants_1 = require("../constants");
 const logging_1 = require("../automations/logging");
 const types_1 = require("@budibase/types");
 const automations_1 = require("../definitions/automations");
-const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
-const { logAlertWithInfo, logWarn } = require("@budibase/backend-core/logging");
-const { processObject } = require("@budibase/string-templates");
+const backend_core_1 = require("@budibase/backend-core");
+const string_templates_1 = require("@budibase/string-templates");
+const fp_1 = require("lodash/fp");
+const environment_1 = __importDefault(require("../environment"));
 const FILTER_STEP_ID = actions_1.default.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions_1.default.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
-const { cloneDeep } = require("lodash/fp");
-const env = require("../environment");
 function typecastForLooping(loopStep, input) {
     if (!input || !input.binding) {
         return null;
@@ -112,7 +111,7 @@ class Orchestrator {
     getMetadata() {
         return __awaiter(this, void 0, void 0, function* () {
             const metadataId = (0, utils_3.generateAutomationMetadataID)(this._automation._id);
-            const db = getAppDB();
+            const db = backend_core_1.context.getAppDB();
             let metadata;
             try {
                 metadata = yield db.get(metadataId);
@@ -131,7 +130,7 @@ class Orchestrator {
             if (!this._job.opts.repeat) {
                 return;
             }
-            logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
+            backend_core_1.logging.logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
             const automation = this._automation;
             const trigger = automation.definition.trigger;
             yield (0, utils_2.disableCronById)(this._job.id);
@@ -172,12 +171,12 @@ class Orchestrator {
             else {
                 metadata.errorCount = 0;
             }
-            const db = getAppDB();
+            const db = backend_core_1.context.getAppDB();
             try {
                 yield db.put(metadata);
             }
             catch (err) {
-                logAlertWithInfo("Failed to write automation metadata", db.name, automation._id, err);
+                backend_core_1.logging.logAlertWithInfo("Failed to write automation metadata", db.name, automation._id, err);
             }
         });
     }
@@ -237,14 +236,14 @@ class Orchestrator {
                     continue;
                 }
                 if (loopStep) {
-                    input = yield processObject(loopStep.inputs, this._context);
+                    input = yield (0, string_templates_1.processObject)(loopStep.inputs, this._context);
                     iterations = getLoopIterations(loopStep, input);
                 }
                 for (let index = 0; index < iterations; index++) {
-                    let originalStepInput = cloneDeep(step.inputs);
+                    let originalStepInput = (0, fp_1.cloneDeep)(step.inputs);
                     // Handle if the user has set a max iteration count or if it reaches the max limit set by us
                     if (loopStep && input.binding) {
-                        let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
+                        let newInput = yield (0, string_templates_1.processObject)(loopStep.inputs, (0, fp_1.cloneDeep)(this._context));
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         try {
                             newInput.binding = typecastForLooping(loopStep, newInput);
@@ -292,7 +291,7 @@ class Orchestrator {
                                 }
                             }
                         }
-                        if (index === env.AUTOMATION_MAX_ITERATION ||
+                        if (index === environment_1.default.AUTOMATION_MAX_ITERATIONS ||
                             index === parseInt(loopStep.inputs.iterations)) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: constants_1.AutomationErrors.MAX_ITERATIONS,
@@ -329,7 +328,7 @@ class Orchestrator {
                     }
                     // If it's a loop step, we need to manually add the bindings to the context
                     let stepFn = yield this.getStepFunctionality(step.stepId);
-                    let inputs = yield processObject(originalStepInput, this._context);
+                    let inputs = yield (0, string_templates_1.processObject)(originalStepInput, this._context);
                     inputs = automationUtils_1.default.cleanInputValues(inputs, step.schema.inputs);
                     try {
                         // appId is always passed
@@ -404,7 +403,7 @@ function execute(job, callback) {
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
-    doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+    return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(job);
         try {
             const response = yield automationOrchestrator.execute();
@@ -421,7 +420,7 @@ const removeStalled = (job) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
-    yield doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+    yield backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(job);
         yield automationOrchestrator.stopCron("stalled");
     }));

package/dist/threads/query.js

@@ -15,14 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
 const utils_1 = __importDefault(require("./utils"));
 utils_1.default.threadSetup();
-const ScriptRunner = require("../utilities/scriptRunner");
-const { getIntegration } = require("../integrations");
-const { processStringSync } = require("@budibase/string-templates");
-const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
-const { refreshOAuthToken, updateUserOAuth, } = require("@budibase/backend-core/auth");
-const { user: userCache } = require("@budibase/backend-core/cache");
-const { getGlobalIDFromUserMetadataID } = require("../db/utils");
-const { cloneDeep } = require("lodash/fp");
+const scriptRunner_1 = __importDefault(require("../utilities/scriptRunner"));
+const integrations_1 = require("../integrations");
+const string_templates_1 = require("@budibase/string-templates");
+const backend_core_1 = require("@budibase/backend-core");
+const utils_2 = require("../db/utils");
+const fp_1 = require("lodash/fp");
 const { isSQL } = require("../integrations/utils");
 const { enrichQueryFields, interpolateSQL, } = require("../integrations/queries/sql");
 class QueryRunner {
@@ -50,9 +48,9 @@ class QueryRunner {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { datasource, fields, queryVerb, transformer } = this;
-            let datasourceClone = cloneDeep(datasource);
-            let fieldsClone = cloneDeep(fields);
-            const Integration = yield getIntegration(datasourceClone.source);
+            let datasourceClone = (0, fp_1.cloneDeep)(datasource);
+            let fieldsClone = (0, fp_1.cloneDeep)(fields);
+            const Integration = yield (0, integrations_1.getIntegration)(datasourceClone.source);
             if (!Integration) {
                 throw "Integration type does not exist.";
             }
@@ -95,7 +93,7 @@ class QueryRunner {
             }
             // transform as required
             if (transformer) {
-                const runner = new ScriptRunner(transformer, {
+                const runner = new scriptRunner_1.default(transformer, {
                     data: rows,
                     params: enrichedParameters,
                 });
@@ -138,7 +136,7 @@ class QueryRunner {
     }
     runAnotherQuery(queryId, parameters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const db = getAppDB();
+            const db = backend_core_1.context.getAppDB();
             const query = yield db.get(queryId);
             const datasource = yield db.get(query.datasourceId);
             return new QueryRunner({
@@ -158,13 +156,13 @@ class QueryRunner {
             if (!providerType || !(oauth2 === null || oauth2 === void 0 ? void 0 : oauth2.refreshToken)) {
                 throw new Error("No refresh token found for authenticated user");
             }
-            const resp = yield refreshOAuthToken(oauth2.refreshToken, providerType, configId);
+            const resp = yield backend_core_1.auth.refreshOAuthToken(oauth2.refreshToken, providerType, configId);
             // Refresh session flow. Should be in same location as refreshOAuthToken
             // There are several other properties available in 'resp'
             if (!resp.err) {
-                const globalUserId = getGlobalIDFromUserMetadataID(_id);
-                yield updateUserOAuth(globalUserId, resp);
-                this.ctx.user = yield userCache.getUser(globalUserId);
+                const globalUserId = (0, utils_2.getGlobalIDFromUserMetadataID)(_id);
+                yield backend_core_1.auth.updateUserOAuth(globalUserId, resp);
+                this.ctx.user = yield backend_core_1.cache.user.getUser(globalUserId);
             }
             else {
                 // In this event the user may have oAuth issues that
@@ -223,7 +221,7 @@ class QueryRunner {
                 const responses = yield Promise.all(dynamics);
                 for (let i = 0; i < foundVars.length; i++) {
                     const variable = foundVars[i];
-                    parameters[variable.name] = processStringSync(variable.value, {
+                    parameters[variable.name] = (0, string_templates_1.processStringSync)(variable.value, {
                         data: responses[i].rows,
                         info: responses[i].extra,
                     }, {
@@ -238,7 +236,7 @@ class QueryRunner {
     }
 }
 function execute(input, callback) {
-    doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
+    backend_core_1.context.doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
         const Runner = new QueryRunner(input);
         try {
             const response = yield Runner.execute();

package/dist/threads/utils.js

@@ -8,18 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.hasExtraData = exports.formatResponse = exports.storeDynamicVariable = exports.invalidateDynamicVariables = exports.checkCacheForDynamicVariable = exports.threadSetup = void 0;
-const env = require("../environment");
-const db = require("../db");
-const redis = require("@budibase/backend-core/redis");
-const { SEPARATOR } = require("@budibase/backend-core/db");
+const environment_1 = __importDefault(require("../environment"));
+const db_1 = __importDefault(require("../db"));
+const backend_core_1 = require("@budibase/backend-core");
 const VARIABLE_TTL_SECONDS = 3600;
 let client;
 function getClient() {
     return __awaiter(this, void 0, void 0, function* () {
         if (!client) {
-            client = yield new redis.Client(redis.utils.Databases.QUERY_VARS).init();
+            client = yield new backend_core_1.redis.Client(backend_core_1.redis.utils.Databases.QUERY_VARS).init();
         }
         return client;
     });
@@ -30,16 +32,16 @@ process.on("exit", () => __awaiter(void 0, void 0, void 0, function* () {
     }
 }));
 function makeVariableKey(queryId, variable) {
-    return `${queryId}${SEPARATOR}${variable}`;
+    return `${queryId}${backend_core_1.db.SEPARATOR}${variable}`;
 }
 function threadSetup() {
     // don't run this if not threading
-    if (env.isTest() || env.DISABLE_THREADING) {
+    if (environment_1.default.isTest() || environment_1.default.DISABLE_THREADING) {
         return;
     }
     // when thread starts, make sure it is recorded
-    env.setInThread();
-    db.init();
+    environment_1.default.setInThread();
+    db_1.default.init();
 }
 exports.threadSetup = threadSetup;
 function checkCacheForDynamicVariable(queryId, variable) {