@budibase/server 1.0.115 → 1.0.118

package/dist/tests/utilities/TestConfiguration.js

@@ -8,9 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const core = require("@budibase/backend-core");
-const CouchDB = require("../../db");
-core.init(CouchDB);
+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");
@@ -19,7 +17,7 @@ const supertest = require("supertest");
 const { cleanup } = require("../../utilities/fileSystem");
 const { Cookies, Headers } = require("@budibase/backend-core/constants");
 const { jwt } = require("@budibase/backend-core/auth");
-const { getGlobalDB } = require("@budibase/backend-core/tenancy");
+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");
@@ -50,8 +48,23 @@ class TestConfiguration {
     getAppId() {
         return this.appId;
     }
-    getCouch() {
-        return CouchDB;
+    doInContext(appId, task) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!appId) {
+                appId = this.appId;
+            }
+            return 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* () {
+                        return task();
+                    }));
+                }
+                else {
+                    return task();
+                }
+            });
+        });
     }
     _req(config, params, controlFunc) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -65,66 +78,57 @@ class TestConfiguration {
             request.request = {
                 body: config,
             };
-            function run() {
-                return __awaiter(this, void 0, void 0, function* () {
-                    if (params) {
-                        request.params = params;
-                    }
-                    yield controlFunc(request);
-                    return request.body;
-                });
-            }
-            // check if already in a context
-            if (context.getAppId() == null && this.appId !== null) {
-                return context.doInAppContext(this.appId, () => __awaiter(this, void 0, void 0, function* () {
-                    return run();
-                }));
-            }
-            else {
-                return run();
-            }
+            return this.doInContext(this.appId, () => __awaiter(this, void 0, void 0, function* () {
+                if (params) {
+                    request.params = params;
+                }
+                yield controlFunc(request);
+                return request.body;
+            }));
         });
     }
     generateApiKey(userId = GLOBAL_USER_ID) {
         return __awaiter(this, void 0, void 0, function* () {
-            const db = getGlobalDB(TENANT_ID);
-            const id = generateDevInfoID(userId);
-            let devInfo;
-            try {
-                devInfo = yield db.get(id);
-            }
-            catch (err) {
-                devInfo = { _id: id, userId };
-            }
-            devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
-            yield db.put(devInfo);
-            return devInfo.apiKey;
+            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+                const id = generateDevInfoID(userId);
+                let devInfo;
+                try {
+                    devInfo = yield db.get(id);
+                }
+                catch (err) {
+                    devInfo = { _id: id, userId };
+                }
+                devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
+                yield db.put(devInfo);
+                return devInfo.apiKey;
+            }));
         });
     }
     globalUser({ id = GLOBAL_USER_ID, builder = true, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const db = getGlobalDB(TENANT_ID);
-            let existing;
-            try {
-                existing = yield db.get(id);
-            }
-            catch (err) {
-                existing = { email };
-            }
-            const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID });
-            yield createASession(id, {
-                sessionId: "sessionid",
-                tenantId: TENANT_ID,
-                csrfToken: CSRF_TOKEN,
-            });
-            if (builder) {
-                user.builder = { global: true };
-            }
-            else {
-                user.builder = { global: false };
-            }
-            const resp = yield db.put(user);
-            return Object.assign({ _rev: resp._rev }, user);
+            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+                let existing;
+                try {
+                    existing = yield db.get(id);
+                }
+                catch (err) {
+                    existing = { email };
+                }
+                const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID });
+                yield createASession(id, {
+                    sessionId: "sessionid",
+                    tenantId: TENANT_ID,
+                    csrfToken: CSRF_TOKEN,
+                });
+                if (builder) {
+                    user.builder = { global: true };
+                }
+                else {
+                    user.builder = { global: false };
+                }
+                const resp = yield db.put(user);
+                return Object.assign({ _rev: resp._rev }, user);
+            }));
         });
     }
     // use a new id as the name to avoid name collisions
@@ -182,9 +186,12 @@ class TestConfiguration {
     createApp(appName) {
         return __awaiter(this, void 0, void 0, function* () {
             // create dev app
+            // clear any old app
+            this.appId = null;
+            yield context.updateAppId(null);
             this.app = yield this._req({ name: appName }, null, controllers.app.create);
             this.appId = this.app.appId;
-            context.updateAppId(this.appId);
+            yield context.updateAppId(this.appId);
             // create production app
             this.prodApp = yield this.deploy();
             this.prodAppId = this.prodApp.appId;

package/dist/threads/utils.js

@@ -9,8 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const env = require("../environment");
-const CouchDB = require("../db");
-const { init } = require("@budibase/backend-core");
+const db = require("../db");
 const redis = require("@budibase/backend-core/redis");
 const { SEPARATOR } = require("@budibase/backend-core/db");
 const VARIABLE_TTL_SECONDS = 3600;
@@ -34,7 +33,7 @@ exports.threadSetup = () => {
     }
     // when thread starts, make sure it is recorded
     env.setInThread();
-    init(CouchDB);
+    db.init();
 };
 function makeVariableKey(queryId, variable) {
     return `${queryId}${SEPARATOR}${variable}`;