@budibase/server 1.4.8-alpha.7 → 1.4.8-alpha.8

package/dist/api/controllers/auth.js

@@ -8,64 +8,73 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { outputProcessing } = require("../../utilities/rowProcessor");
-const { InternalTables } = require("../../db/utils");
-const { getFullUser } = require("../../utilities/users");
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { getAppDB, getAppId } = require("@budibase/backend-core/context");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchSelf = void 0;
+const rowProcessor_1 = require("../../utilities/rowProcessor");
+const utils_1 = require("../../db/utils");
+const users_1 = require("../../utilities/users");
+const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
+const PUBLIC_ROLE = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
 /**
  * Add the attributes that are session based to the current user.
  */
-const addSessionAttributesToUser = ctx => {
+const addSessionAttributesToUser = (ctx) => {
     if (ctx.user) {
         ctx.body.license = ctx.user.license;
     }
 };
-exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    let userId = ctx.user.userId || ctx.user._id;
-    /* istanbul ignore next */
-    if (!userId || !ctx.isAuthenticated) {
-        ctx.body = {};
-        return;
-    }
-    const user = yield getFullUser(ctx, userId);
-    // this shouldn't be returned by the app self
-    delete user.roles;
-    // forward the csrf token from the session
-    user.csrfToken = ctx.user.csrfToken;
-    if (getAppId()) {
-        const db = getAppDB();
-        // remove the full roles structure
-        delete user.roles;
-        try {
-            const userTable = yield db.get(InternalTables.USER_METADATA);
-            const metadata = yield db.get(userId);
-            // make sure there is never a stale csrf token
-            delete metadata.csrfToken;
-            // specifically needs to make sure is enriched
-            ctx.body = yield outputProcessing(userTable, Object.assign(Object.assign({}, user), metadata));
+function fetchSelf(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let userId = ctx.user.userId || ctx.user._id;
+        /* istanbul ignore next */
+        if (!userId || !ctx.isAuthenticated) {
+            ctx.body = {};
+            return;
         }
-        catch (err) {
-            let response;
-            // user didn't exist in app, don't pretend they do
-            if (user.roleId === BUILTIN_ROLE_IDS.PUBLIC) {
-                response = {};
+        const appId = backend_core_1.context.getAppId();
+        const user = yield (0, users_1.getFullUser)(ctx, userId);
+        // this shouldn't be returned by the app self
+        delete user.roles;
+        // forward the csrf token from the session
+        user.csrfToken = ctx.user.csrfToken;
+        if (appId) {
+            const db = backend_core_1.context.getAppDB();
+            // check for group permissions
+            if (!user.roleId || user.roleId === PUBLIC_ROLE) {
+                const groupRoleId = yield pro_1.groups.getGroupRoleId(user, appId);
+                user.roleId = groupRoleId || user.roleId;
             }
-            // user has a role of some sort, return them
-            else if (err.status === 404) {
-                const metadata = Object.assign(Object.assign({}, user), { _id: userId });
-                const dbResp = yield db.put(metadata);
-                user._rev = dbResp.rev;
-                response = user;
+            // remove the full roles structure
+            delete user.roles;
+            try {
+                const userTable = yield db.get(utils_1.InternalTables.USER_METADATA);
+                // specifically needs to make sure is enriched
+                ctx.body = yield (0, rowProcessor_1.outputProcessing)(userTable, user);
             }
-            else {
-                response = user;
+            catch (err) {
+                let response;
+                // user didn't exist in app, don't pretend they do
+                if (user.roleId === PUBLIC_ROLE) {
+                    response = {};
+                }
+                // user has a role of some sort, return them
+                else if (err.status === 404) {
+                    const metadata = Object.assign(Object.assign({}, user), { _id: userId });
+                    const dbResp = yield db.put(metadata);
+                    user._rev = dbResp.rev;
+                    response = user;
+                }
+                else {
+                    response = user;
+                }
+                ctx.body = response;
             }
-            ctx.body = response;
         }
-    }
-    else {
-        ctx.body = user;
-    }
-    addSessionAttributesToUser(ctx);
-});
+        else {
+            ctx.body = user;
+        }
+        addSessionAttributesToUser(ctx);
+    });
+}
+exports.fetchSelf = fetchSelf;

package/dist/api/controllers/integration.js

@@ -17,7 +17,7 @@ exports.fetch = function (ctx) {
         ctx.status = 200;
         const defs = yield getDefinitions();
         // for google sheets integration google verification
-        if (featureFlags.isEnabled(featureFlags.FeatureFlag.GOOGLE_SHEETS)) {
+        if (featureFlags.isEnabled(featureFlags.TenantFeatureFlag.GOOGLE_SHEETS)) {
             defs[SourceName.GOOGLE_SHEETS] = googlesheets.schema;
         }
         ctx.body = defs;

package/dist/api/routes/analytics.js

@@ -1,7 +1,7 @@
 "use strict";
 const Router = require("@koa/router");
 const controller = require("../controllers/analytics");
-const router = Router();
+const router = new Router();
 router.get("/api/bbtel", controller.isEnabled);
 router.post("/api/bbtel/ping", controller.ping);
 module.exports = router;

package/dist/api/routes/apikeys.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/apikeys");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .get("/api/keys", authorized(BUILDER), controller.fetch)
     .put("/api/keys/:key", authorized(BUILDER), controller.update);

package/dist/api/routes/auth.js

@@ -1,6 +1,33 @@
 "use strict";
-const Router = require("@koa/router");
-const controller = require("../controllers/auth");
-const router = Router();
+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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const router_1 = __importDefault(require("@koa/router"));
+const controller = __importStar(require("../controllers/auth"));
+const router = new router_1.default();
 router.get("/api/self", controller.fetchSelf);
-module.exports = router;
+exports.default = router;

package/dist/api/routes/automation.js

@@ -6,7 +6,7 @@ const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backe
 const { bodyResource, paramResource } = require("../../middleware/resourceId");
 const { middleware: appInfoMiddleware, AppType, } = require("../../middleware/appInfo");
 const { automationValidator } = require("./utils/validators");
-const router = Router();
+const router = new Router();
 router
     .get("/api/automations/trigger/list", authorized(BUILDER), controller.getTriggerList)
     .get("/api/automations/action/list", authorized(BUILDER), controller.getActionList)

package/dist/api/routes/backup.js

@@ -3,6 +3,6 @@ const Router = require("@koa/router");
 const controller = require("../controllers/backup");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump);
 module.exports = router;

package/dist/api/routes/cloud.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/cloud");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .get("/api/cloud/export", authorized(BUILDER), controller.exportApps)
     // has to be public, only run if apps don't exist

package/dist/api/routes/component.js

@@ -3,6 +3,6 @@ const Router = require("@koa/router");
 const controller = require("../controllers/component");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router.get("/api/:appId/components/definitions", authorized(BUILDER), controller.fetchAppComponentDefinitions);
 module.exports = router;

package/dist/api/routes/datasource.js

@@ -4,7 +4,7 @@ const datasourceController = require("../controllers/datasource");
 const authorized = require("../../middleware/authorized");
 const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const { datasourceValidator, datasourceQueryValidator, } = require("./utils/validators");
-const router = Router();
+const router = new Router();
 router
     .get("/api/datasources", authorized(BUILDER), datasourceController.fetch)
     .get("/api/datasources/:datasourceId", authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceController.find)

package/dist/api/routes/deploy.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/deploy");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .get("/api/deployments", authorized(BUILDER), controller.fetchDeployments)
     .get("/api/deploy/:deploymentId", authorized(BUILDER), controller.deploymentProgress)

package/dist/api/routes/dev.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/dev");
 const env = require("../../environment");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 function redirectPath(path) {
     router
         .get(`/api/${path}/:devPath(.*)`, controller.buildRedirectGet(path))

package/dist/api/routes/integration.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/integration");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .get("/api/integrations", authorized(BUILDER), controller.fetch)
     .get("/api/integrations/:type", authorized(BUILDER), controller.find);

package/dist/api/routes/layout.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
 const controller = require("../controllers/layout");
-const router = Router();
+const router = new Router();
 router
     .post("/api/layouts", authorized(BUILDER), controller.save)
     .delete("/api/layouts/:layoutId/:layoutRev", authorized(BUILDER), controller.destroy);

package/dist/api/routes/metadata.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/metadata");
 const { middleware: appInfoMiddleware, AppType, } = require("../../middleware/appInfo");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .post("/api/metadata/:type/:entityId", authorized(BUILDER), appInfoMiddleware({ appType: AppType.DEV }), controller.saveMetadata)
     .delete("/api/metadata/:type/:entityId", authorized(BUILDER), appInfoMiddleware({ appType: AppType.DEV }), controller.deleteMetadata)

package/dist/api/routes/migrations.js

@@ -1,7 +1,7 @@
 "use strict";
 const Router = require("@koa/router");
 const migrationsController = require("../controllers/migrations");
-const router = Router();
+const router = new Router();
 const { internalApi } = require("@budibase/backend-core/auth");
 router
     .post("/api/migrations/run", internalApi, migrationsController.migrate)

package/dist/api/routes/permission.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/permission");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
 const { permissionValidator } = require("./utils/validators");
-const router = Router();
+const router = new Router();
 router
     .get("/api/permission/builtin", authorized(BUILDER), controller.fetchBuiltin)
     .get("/api/permission/levels", authorized(BUILDER), controller.fetchLevels)

package/dist/api/routes/query.js

@@ -5,7 +5,7 @@ const authorized = require("../../middleware/authorized");
 const { PermissionLevels, PermissionTypes, BUILDER, } = require("@budibase/backend-core/permissions");
 const { bodyResource, bodySubResource, paramResource, } = require("../../middleware/resourceId");
 const { generateQueryPreviewValidation, generateQueryValidation, } = require("../controllers/query/validation");
-const router = Router();
+const router = new Router();
 router
     .get("/api/queries", authorized(BUILDER), queryController.fetch)
     .post("/api/queries", bodySubResource("datasourceId", "_id"), authorized(BUILDER), generateQueryValidation(), queryController.save)

package/dist/api/routes/role.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/role");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
 const { roleValidator } = require("./utils/validators");
-const router = Router();
+const router = new Router();
 router
     .post("/api/roles", authorized(BUILDER), roleValidator(), controller.save)
     .get("/api/roles", authorized(BUILDER), controller.fetch)

package/dist/api/routes/routing.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
 const controller = require("../controllers/routing");
-const router = Router();
+const router = new Router();
 router
     // gets correct structure for user role
     .get("/api/routing/client", controller.clientFetch)

package/dist/api/routes/screen.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/screen");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
 const { screenValidator } = require("./utils/validators");
-const router = Router();
+const router = new Router();
 router
     .get("/api/screens", authorized(BUILDER), controller.fetch)
     .post("/api/screens", authorized(BUILDER), screenValidator(), controller.save)

package/dist/api/routes/script.js

@@ -3,6 +3,6 @@ const Router = require("@koa/router");
 const controller = require("../controllers/script");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router.post("/api/script", authorized(BUILDER), controller.save);
 module.exports = router;

package/dist/api/routes/table.js

@@ -5,7 +5,7 @@ const authorized = require("../../middleware/authorized");
 const { paramResource, bodyResource } = require("../../middleware/resourceId");
 const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const { tableValidator } = require("./utils/validators");
-const router = Router();
+const router = new Router();
 router
     /**
      * @api {get} /api/tables Fetch all tables

package/dist/api/routes/templates.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/templates");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .get("/api/templates", authorized(BUILDER), controller.fetch)
     .get("/api/templates/:type/:name", authorized(BUILDER), controller.downloadTemplate);

package/dist/api/routes/user.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/user");
 const authorized = require("../../middleware/authorized");
 const { PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .get("/api/users/metadata", authorized(PermissionTypes.USER, PermissionLevels.READ), controller.fetchMetadata)
     .get("/api/users/metadata/:id", authorized(PermissionTypes.USER, PermissionLevels.READ), controller.findMetadata)

package/dist/api/routes/view.js

@@ -5,7 +5,7 @@ const rowController = require("../controllers/row");
 const authorized = require("../../middleware/authorized");
 const { paramResource } = require("../../middleware/resourceId");
 const { BUILDER, PermissionTypes, PermissionLevels, } = require("@budibase/backend-core/permissions");
-const router = Router();
+const router = new Router();
 router
     .get("/api/views/export", authorized(BUILDER), viewController.exportView)
     .get("/api/views/:viewName", paramResource("viewName"), authorized(PermissionTypes.VIEW, PermissionLevels.READ), rowController.fetchView)

package/dist/api/routes/webhook.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/webhook");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
 const { webhookValidator } = require("./utils/validators");
-const router = Router();
+const router = new Router();
 router
     .get("/api/webhooks", authorized(BUILDER), controller.fetch)
     .put("/api/webhooks", authorized(BUILDER), webhookValidator(), controller.save)

package/dist/middleware/authorized.js

@@ -39,9 +39,9 @@ const checkAuthorized = (ctx, resourceRoles, permType, permLevel) => __awaiter(v
 const checkAuthorizedResource = (ctx, resourceRoles, permType, permLevel) => __awaiter(void 0, void 0, void 0, function* () {
     // get the user's roles
     const roleId = ctx.roleId || roles_1.BUILTIN_ROLE_IDS.PUBLIC;
-    const userRoles = yield (0, roles_1.getUserRoleHierarchy)(roleId, {
+    const userRoles = (yield (0, roles_1.getUserRoleHierarchy)(roleId, {
         idOnly: false,
-    });
+    }));
     const permError = "User does not have permission";
     // check if the user has the required role
     if (resourceRoles.length > 0) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.4.8-alpha.6",
+    "version": "1.4.8-alpha.7",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "1.4.8-alpha.6",
-        "@budibase/client": "1.4.8-alpha.6",
-        "@budibase/pro": "1.4.8-alpha.6",
-        "@budibase/string-templates": "1.4.8-alpha.6",
-        "@budibase/types": "1.4.8-alpha.6",
+        "@budibase/backend-core": "1.4.8-alpha.7",
+        "@budibase/client": "1.4.8-alpha.7",
+        "@budibase/pro": "1.4.8-alpha.7",
+        "@budibase/string-templates": "1.4.8-alpha.7",
+        "@budibase/types": "1.4.8-alpha.7",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",