@budibase/server 0.9.173-alpha.1 → 0.9.173-alpha.2

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -57,9 +57,10 @@ exports.createRequest = (request, method, url, body) => {
     return req;
 };
 exports.checkBuilderEndpoint = ({ config, method, url, body }) => __awaiter(void 0, void 0, void 0, function* () {
-    const headers = yield config.login("test@test.com", "test", {
+    const headers = yield config.login({
         userId: "us_fail",
         builder: false,
+        prodApp: true,
     });
     yield exports
         .createRequest(config.request, method, url, body)
@@ -67,11 +68,9 @@ exports.checkBuilderEndpoint = ({ config, method, url, body }) => __awaiter(void
         .expect(403);
 });
 exports.checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRole, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const password = "PASSWORD";
-    let user = yield config.createUser("pass@budibase.com", password, passRole);
-    const passHeader = yield config.login("pass@budibase.com", password, {
+    const passHeader = yield config.login({
         roleId: passRole,
-        userId: user.globalId,
+        prodApp: true,
     });
     yield exports
         .createRequest(config.request, method, url, body)
@@ -79,14 +78,13 @@ exports.checkPermissionsEndpoint = ({ config, method, url, body, passRole, failR
         .expect(200);
     let failHeader;
     if (failRole === BUILTIN_ROLE_IDS.PUBLIC) {
-        failHeader = config.publicHeaders();
+        failHeader = config.publicHeaders({ prodApp: true });
     }
     else {
-        user = yield config.createUser("fail@budibase.com", password, failRole);
-        failHeader = yield config.login("fail@budibase.com", password, {
+        failHeader = yield config.login({
             roleId: failRole,
-            userId: user.globalId,
             builder: false,
+            prodApp: true,
         });
     }
     yield exports

package/dist/middleware/currentapp.js

@@ -12,7 +12,7 @@ const { getAppId, setCookie, getCookie, clearCookie } = require("@budibase/auth"
 const { Cookies } = require("@budibase/auth").constants;
 const { getRole } = require("@budibase/auth/roles");
 const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
-const { generateUserMetadataID } = require("../db/utils");
+const { generateUserMetadataID, isDevAppID } = require("../db/utils");
 const { dbExists } = require("@budibase/auth/db");
 const { isUserInAppTenant } = require("@budibase/auth/tenancy");
 const { getCachedSelf } = require("../utilities/global");
@@ -43,6 +43,12 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         // if the request app ID wasn't set, update it with the cookie
         requestAppId = requestAppId || appId;
     }
+    // deny access to application preview
+    if (isDevAppID(requestAppId) &&
+        (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
+        clearCookie(ctx, Cookies.CurrentApp);
+        return ctx.redirect("/");
+    }
     let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;
     if (!ctx.user) {
         // not logged in, try to set a cookie for public apps

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.173-alpha.0",
+    "version": "0.9.173-alpha.1",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,9 +68,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.173-alpha.0",
-        "@budibase/client": "^0.9.173-alpha.0",
-        "@budibase/string-templates": "^0.9.173-alpha.0",
+        "@budibase/auth": "^0.9.173-alpha.1",
+        "@budibase/client": "^0.9.173-alpha.1",
+        "@budibase/string-templates": "^0.9.173-alpha.1",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",

package/dist/tests/utilities/TestConfiguration.js

@@ -24,7 +24,6 @@ const CouchDB = require("../../db");
 auth.init(CouchDB);
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
-const PASSWORD = "babs_password";
 class TestConfiguration {
     constructor(openServer = true) {
         if (openServer) {
@@ -62,7 +61,7 @@ class TestConfiguration {
             return request.body;
         });
     }
-    globalUser(id = GLOBAL_USER_ID, builder = true, roles) {
+    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;
@@ -70,13 +69,16 @@ class TestConfiguration {
                 existing = yield db.get(id);
             }
             catch (err) {
-                existing = {};
+                existing = { email };
             }
             const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID });
             yield createASession(id, { sessionId: "sessionid", tenantId: TENANT_ID });
             if (builder) {
                 user.builder = { global: true };
             }
+            else {
+                user.builder = { global: false };
+            }
             const resp = yield db.put(user);
             return Object.assign({ _rev: resp._rev }, user);
         });
@@ -120,28 +122,42 @@ class TestConfiguration {
         }
         return headers;
     }
-    publicHeaders() {
+    publicHeaders({ prodApp = true } = {}) {
+        const appId = prodApp ? this.prodAppId : this.appId;
         const headers = {
             Accept: "application/json",
         };
-        if (this.appId) {
-            headers[Headers.APP_ID] = this.appId;
+        if (appId) {
+            headers[Headers.APP_ID] = appId;
         }
         return headers;
     }
-    roleHeaders({ email = EMAIL, roleId = BUILTIN_ROLE_IDS.ADMIN, builder = false, }) {
+    roleHeaders({ email = EMAIL, roleId = BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.login(email, PASSWORD, { roleId, builder });
+            return this.login({ email, roleId, builder, prodApp });
         });
     }
     createApp(appName) {
         return __awaiter(this, void 0, void 0, function* () {
+            // create dev app
             this.app = yield this._req({ name: appName }, null, controllers.app.create);
             this.appId = this.app.appId;
+            // create production app
+            this.prodApp = yield this.deploy();
+            this.prodAppId = this.prodApp.appId;
+            this.allApps.push(this.prodApp);
             this.allApps.push(this.app);
             return this.app;
         });
     }
+    deploy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deployment = yield this._req(null, null, controllers.deploy.deployApp);
+            const prodAppId = deployment.appId.replace("_dev", "");
+            const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage);
+            return appPackage.application;
+        });
+    }
     updateTable(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicTable();
@@ -307,30 +323,29 @@ class TestConfiguration {
             return yield this._req(config, null, controllers.layout.save);
         });
     }
-    createUser(id = null) {
+    createUser(id = null, email = EMAIL) {
         return __awaiter(this, void 0, void 0, function* () {
             const globalId = !id ? `us_${Math.random()}` : `us_${id}`;
-            const resp = yield this.globalUser(globalId);
+            const resp = yield this.globalUser({ id: globalId, email });
             yield userCache.invalidateUser(globalId);
             return Object.assign(Object.assign({}, resp), { globalId });
         });
     }
-    login(email, password, { roleId, userId, builder } = {}) {
+    login({ roleId, userId, builder, prodApp = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
+            const appId = prodApp ? this.prodAppId : this.appId;
             userId = !userId ? `us_uuid1` : userId;
             if (!this.request) {
                 throw "Server has not been opened, cannot login.";
             }
             // make sure the user exists in the global DB
             if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
-                const appId = `app${this.getAppId().split("app_dev")[1]}`;
-                yield this.globalUser(userId, builder, {
-                    [appId]: roleId,
+                yield this.globalUser({
+                    userId,
+                    builder,
+                    roles: { [this.prodAppId]: roleId },
                 });
             }
-            if (!email || !password) {
-                yield this.createUser();
-            }
             yield createASession(userId, {
                 sessionId: "sessionid",
                 tenantId: TENANT_ID,
@@ -343,7 +358,7 @@ class TestConfiguration {
             };
             const app = {
                 roleId: roleId,
-                appId: this.appId,
+                appId,
             };
             const authToken = jwt.sign(auth, env.JWT_SECRET);
             const appToken = jwt.sign(app, env.JWT_SECRET);
@@ -355,7 +370,7 @@ class TestConfiguration {
                     `${Cookies.Auth}=${authToken}`,
                     `${Cookies.CurrentApp}=${appToken}`,
                 ],
-                [Headers.APP_ID]: this.appId,
+                [Headers.APP_ID]: appId,
             };
         });
     }

package/dist/tests/utilities/controllers.js

@@ -13,4 +13,5 @@ module.exports = {
     screen: require("../../api/controllers/screen"),
     webhook: require("../../api/controllers/webhook"),
     layout: require("../../api/controllers/layout"),
+    deploy: require("../../api/controllers/deploy"),
 };