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

package/dist/utilities/global.js

@@ -16,6 +16,7 @@ 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 } = {}) => {
     appId = appId || getAppId();
     if (!user || !user.roles) {
@@ -40,11 +41,27 @@ exports.updateAppRole = (user, { appId } = {}) => {
     delete user.roles;
     return user;
 };
+function checkGroupRoles(user, { appId } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!user.roleId) {
+            let roleId = yield groups.getGroupRoleId(user, appId);
+            user.roleId = roleId;
+        }
+        return user;
+    });
+}
 function processUser(user, { appId } = {}) {
-    if (user) {
-        delete user.password;
-    }
-    return exports.updateAppRole(user, { appId });
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (user) {
+            delete user.password;
+        }
+        user = yield exports.updateAppRole(user, { appId });
+        if ((_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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.1.25-alpha.1",
+  "version": "1.1.25-alpha.2",
   "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.1.25-alpha.1",
-    "@budibase/client": "^1.1.25-alpha.1",
-    "@budibase/pro": "1.1.25-alpha.0",
-    "@budibase/string-templates": "^1.1.25-alpha.1",
-    "@budibase/types": "^1.1.25-alpha.1",
+    "@budibase/backend-core": "^1.1.25-alpha.2",
+    "@budibase/client": "^1.1.25-alpha.2",
+    "@budibase/pro": "1.1.25-alpha.1",
+    "@budibase/string-templates": "^1.1.25-alpha.2",
+    "@budibase/types": "^1.1.25-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "9db76793514f45aa5942ca5a4fd82930e19abab3"
+  "gitHead": "d65ab980afd4cbd07fcf0491af97ac5a60db01be"
 }

package/src/api/controllers/query/index.ts

@@ -246,7 +246,7 @@ async function execute(
 }
 
 export async function executeV1(ctx: any) {
-  return execute(ctx, { rowsOnly: true })
+  return execute(ctx, { rowsOnly: true, isAutomation: false })
 }
 
 export async function executeV2(

package/src/api/controllers/query/validation.js

@@ -1,4 +1,4 @@
-const joiValidator = require("../../../middleware/joi-validator")
+const { joiValidator } = require("@budibase/backend-core/auth")
 const Joi = require("joi")
 
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")

package/src/api/routes/tests/user.spec.js

@@ -23,6 +23,7 @@ describe("/users", () => {
   })
 
   describe("fetch", () => {
+
     it("returns a list of users from an instance db", async () => {
       await config.createUser("uuidx")
       await config.createUser("uuidy")
@@ -37,6 +38,7 @@ describe("/users", () => {
       expect(res.body.find(u => u._id === `ro_ta_users_us_uuidy`)).toBeDefined()
     })
 
+
     it("should apply authorization to endpoint", async () => {
       await config.createUser()
       await checkPermissionsEndpoint({

package/src/api/routes/utils/validators.js

@@ -1,4 +1,4 @@
-const joiValidator = require("../../../middleware/joi-validator")
+const { joiValidator } = require("@budibase/backend-core/auth")
 const { DataSourceOperation } = require("../../../constants")
 const { WebhookType } = require("../../../constants")
 const {

package/src/automations/steps/executeQuery.js

@@ -74,6 +74,7 @@ exports.run = async function ({ inputs, appId, emitter }) {
   try {
     await queryController.executeV2(ctx, { isAutomation: true })
     const { data, ...rest } = ctx.body
+
     return {
       response: data,
       info: rest,

package/src/middleware/tests/currentapp.spec.js

@@ -1,5 +1,6 @@
 mockAuthWithNoCookie()
 mockWorker()
+mockUserGroups()
 
 jest.mock("@budibase/backend-core/db", () => {
   const coreDb = jest.requireActual("@budibase/backend-core/db")
@@ -29,6 +30,16 @@ function mockReset() {
   mockWorker()
 }
 
+function mockUserGroups() {
+  jest.mock("@budibase/pro", () => ({
+    groups: {
+      getGroupRoleId: () => {
+        return "BASIC"
+      },
+    },
+  }))
+}
+
 function mockAuthWithNoCookie() {
   jest.resetModules()
   mockWorker()

package/src/utilities/global.js

@@ -12,9 +12,11 @@ const {
 } = 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 } = {}) => {
   appId = appId || getAppId()
+
   if (!user || !user.roles) {
     return user
   }
@@ -33,15 +35,30 @@ exports.updateAppRole = (user, { appId } = {}) => {
   } else if (!user.roleId) {
     user.roleId = BUILTIN_ROLE_IDS.PUBLIC
   }
+
   delete user.roles
   return user
 }
 
-function processUser(user, { appId } = {}) {
+async function checkGroupRoles(user, { appId } = {}) {
+  if (!user.roleId) {
+    let roleId = await groups.getGroupRoleId(user, appId)
+    user.roleId = roleId
+  }
+
+  return user
+}
+
+async function processUser(user, { appId } = {}) {
   if (user) {
     delete user.password
   }
-  return exports.updateAppRole(user, { appId })
+  user = await exports.updateAppRole(user, { appId })
+  if (user?.userGroups?.length) {
+    user = await checkGroupRoles(user, { appId })
+  }
+
+  return user
 }
 
 exports.getCachedSelf = async (ctx, appId) => {
@@ -89,6 +106,7 @@ exports.getGlobalUsers = async (users = null) => {
   if (!appId) {
     return globalUsers
   }
+
   return globalUsers.map(user => exports.updateAppRole(user))
 }