@budibase/server 1.1.32-alpha.6 → 1.1.32

package/src/utilities/global.js

@@ -12,11 +12,9 @@ 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
   }
@@ -32,33 +30,18 @@ exports.updateAppRole = (user, { appId } = {}) => {
   // if a role wasn't found then either set as admin (builder) or public (everyone else)
   if (!user.roleId && user.builder && user.builder.global) {
     user.roleId = BUILTIN_ROLE_IDS.ADMIN
-  } else if (!user.roleId && !user?.userGroups?.length) {
+  } else if (!user.roleId) {
     user.roleId = BUILTIN_ROLE_IDS.PUBLIC
-  } else if (user?.userGroups?.length) {
-    user.roleId = null
   }
-
   delete user.roles
   return user
 }
 
-async function checkGroupRoles(user, { appId } = {}) {
-  let roleId = await groups.getGroupRoleId(user, appId)
-  user.roleId = roleId
-
-  return user
-}
-
-async function processUser(user, { appId } = {}) {
+function processUser(user, { appId } = {}) {
   if (user) {
     delete user.password
   }
-  user = await exports.updateAppRole(user, { appId })
-  if (!user.roleId && user?.userGroups?.length) {
-    user = await checkGroupRoles(user, { appId })
-  }
-
-  return user
+  return exports.updateAppRole(user, { appId })
 }
 
 exports.getCachedSelf = async (ctx, appId) => {
@@ -106,7 +89,6 @@ exports.getGlobalUsers = async (users = null) => {
   if (!appId) {
     return globalUsers
   }
-
   return globalUsers.map(user => exports.updateAppRole(user))
 }
 

package/src/utilities/queue/inMemoryQueue.js

@@ -109,10 +109,6 @@ class InMemoryQueue {
   async clean() {
     return []
   }
-
-  async getJob() {
-    return {}
-  }
 }
 
 module.exports = InMemoryQueue