@budibase/worker 3.31.1 → 3.31.3

package/jest.config.ts

@@ -1,5 +1,4 @@
 import { Config } from "jest"
-import * as fs from "fs"
 
 const config: Config = {
   globalSetup: "./../../globalSetup.ts",
@@ -16,13 +15,9 @@ const config: Config = {
     "@budibase/types": "<rootDir>/../types/src",
     "@budibase/shared-core": ["<rootDir>/../shared-core/src"],
     "@budibase/string-templates": ["<rootDir>/../string-templates/src"],
+    "@budibase/pro/(.*)": "<rootDir>/../pro/$1",
+    "@budibase/pro": "<rootDir>/../pro/src",
   },
 }
 
-// add pro sources if they exist
-if (fs.existsSync("../pro/src")) {
-  config.moduleNameMapper!["@budibase/pro/(.*)"] = "<rootDir>/../pro/$1"
-  config.moduleNameMapper!["@budibase/pro"] = "<rootDir>/../pro/src"
-}
-
 export default config

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.31.1",
+  "version": "3.31.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,7 +37,6 @@
     "@govtechsg/passport-openidconnect": "1.0.3",
     "@koa/router": "15.3.0",
     "@types/global-agent": "2.1.1",
-    "aws-sdk": "2.1692.0",
     "bcrypt": "6.0.0",
     "bull": "4.10.1",
     "dd-trace": "5.63.0",
@@ -48,28 +47,19 @@
     "ical-generator": "4.1.0",
     "joi": "17.6.0",
     "jsonwebtoken": "9.0.2",
-    "knex": "2.4.2",
     "koa": "2.15.4",
     "koa-body": "4.2.0",
     "koa-compress": "4.0.1",
-    "koa-passport": "4.1.4",
     "koa-redis": "^4.0.1",
-    "koa-send": "5.0.1",
     "koa-session": "5.13.1",
-    "koa-static": "5.0.0",
     "koa-useragent": "^4.1.0",
     "lodash": "4.17.23",
     "marked": "^15.0.11",
     "node-fetch": "2.6.7",
     "nodemailer": "7.0.11",
-    "passport-google-oauth": "2.0.0",
-    "passport-local": "1.0.0",
     "pouchdb": "9.0.0",
-    "pouchdb-all-dbs": "1.1.1",
     "scim-patch": "^0.8.1",
     "scim2-parse-filter": "^0.2.8",
-    "server-destroy": "1.0.1",
-    "undici": "^7.16.0",
     "uuid": "^8.3.2",
     "yaml": "^2.8.2"
   },
@@ -79,7 +69,6 @@
     "@types/maildev": "^0.0.7",
     "@types/node-fetch": "2.6.4",
     "@types/nodemailer": "^6.4.17",
-    "@types/server-destroy": "1.0.1",
     "@types/supertest": "2.0.14",
     "@types/uuid": "8.3.4",
     "cheerio": "^1.0.0",
@@ -91,23 +80,5 @@
     "supertest": "6.3.3",
     "timekeeper": "2.2.0"
   },
-  "resolutions": {
-    "@budibase/pro": "npm:@budibase/pro@latest"
-  },
-  "nx": {
-    "targets": {
-      "dev": {
-        "dependsOn": [
-          {
-            "comment": "Required for pro usage when submodule not loaded",
-            "projects": [
-              "@budibase/backend-core"
-            ],
-            "target": "build:oss"
-          }
-        ]
-      }
-    }
-  },
-  "gitHead": "9de72ce9dd1c290eb3d16fd22693192923f46f06"
+  "gitHead": "7f5947eadcf2e540ae7e9334ef8f160be64fea2e"
 }

package/src/api/controllers/global/configs.ts

@@ -514,9 +514,6 @@ export async function find(ctx: UserCtx<void, FindConfigResponse>) {
     case ConfigType.OIDC_LOGOS:
       await enrichOIDCLogos(config)
       break
-    case ConfigType.AI:
-      await pro.sdk.ai.enrichAIConfig(config)
-      break
   }
 
   stripSecrets(config, ctx)

package/src/api/controllers/global/users.ts

@@ -9,8 +9,13 @@ import {
   tenancy,
   users,
 } from "@budibase/backend-core"
-import { groups as proGroups } from "@budibase/pro"
-import { BpmStatusKey, BpmStatusValue, utils } from "@budibase/shared-core"
+import { db as proDb } from "@budibase/pro"
+import {
+  BpmStatusKey,
+  BpmStatusValue,
+  dataFilters,
+  utils,
+} from "@budibase/shared-core"
 import {
   AcceptUserInviteRequest,
   AcceptUserInviteResponse,
@@ -50,6 +55,7 @@ import {
   UnsavedUser,
   UpdateInviteResponse,
   User,
+  UserGroup,
   UserCtx,
   UserIdentifier,
 } from "@budibase/types"
@@ -370,12 +376,66 @@ const searchWorkspaceUsers = async (
     return { data: [], hasNextPage: false }
   }
 
+  const prodWorkspaceId = db.getProdWorkspaceID(workspaceId)
   const limit = body.limit ?? DEFAULT_USER_LIMIT
   const query = body.query
-  const filtered: User[] = []
-  let cursor = body.bookmark
-  let nextPage: string | undefined
-  const groupAccessCache = new Map<string, boolean>()
+  const globalDb = context.getGlobalDB()
+
+  const [workspaceUsers, globalPermissionUsers, workspaceGroups] =
+    await Promise.all([
+      db.queryGlobalView<User>(
+        db.ViewName.USER_BY_WORKSPACE,
+        db.getUsersByWorkspaceParams(prodWorkspaceId, {
+          include_docs: true,
+        }),
+        undefined,
+        { arrayResponse: true }
+      ) as Promise<User[]>,
+      globalDb
+        .find<User>({
+          selector: {
+            _id: {
+              $regex: `^${db.DocumentType.USER}${db.SEPARATOR}`,
+            },
+            $or: [{ "admin.global": true }, { "builder.global": true }],
+          },
+        })
+        .then(response => response.docs),
+      globalDb
+        .allDocs<UserGroup>(
+          db.getDocParams(db.DocumentType.GROUP, null, {
+            include_docs: true,
+          })
+        )
+        .then(
+          response =>
+            response.rows
+              .map(row => row.doc)
+              .filter(group => !!group?.roles?.[prodWorkspaceId]) as UserGroup[]
+        ),
+    ])
+
+  const workspaceGroupIds = workspaceGroups.map(group => group._id!)
+  const workspaceGroupIdSet = new Set(workspaceGroupIds)
+
+  let groupUsers: User[] = []
+  if (workspaceGroupIds.length) {
+    const usersByGroup = await Promise.all(
+      workspaceGroupIds.map(groupId => proDb.groups.getGroupUsers(groupId))
+    )
+    const groupUserIds = [
+      ...new Set(
+        usersByGroup
+          .flat()
+          .map(user => user._id)
+          .filter(Boolean)
+      ),
+    ] as string[]
+
+    if (groupUserIds.length) {
+      groupUsers = await userSdk.db.bulkGet(groupUserIds)
+    }
+  }
 
   const getBookmarkValue = (user: User) => {
     if (query?.string?.email && user.email) {
@@ -384,73 +444,54 @@ const searchWorkspaceUsers = async (
     return user._id
   }
 
-  const hydrateGroupAccess = async (usersToCheck: User[]) => {
-    const missingGroupIds = new Set<string>()
-    for (const user of usersToCheck) {
-      for (const groupId of user.userGroups || []) {
-        if (!groupAccessCache.has(groupId)) {
-          missingGroupIds.add(groupId)
-        }
-      }
-    }
-
-    if (!missingGroupIds.size) {
-      return
-    }
-
-    const groupIdList = [...missingGroupIds]
-    const groups = await proGroups.getBulk(groupIdList, { enriched: false })
-    groups.forEach((group, index) => {
-      const groupId = group?._id || groupIdList[index]
-      const hasAccess = !!group?.roles?.[workspaceId]
-      groupAccessCache.set(groupId, hasAccess)
-    })
-  }
-
   const hasWorkspaceAccess = (user: User) => {
-    if (users.isAdminOrBuilder(user, workspaceId)) {
+    if (users.isAdminOrBuilder(user, prodWorkspaceId)) {
       return true
     }
-    if (user.roles?.[workspaceId]) {
+    if (user.roles?.[prodWorkspaceId]) {
       return true
     }
     return (user.userGroups || []).some(groupId =>
-      groupAccessCache.get(groupId)
+      workspaceGroupIdSet.has(groupId)
     )
   }
 
-  while (filtered.length <= limit) {
-    const page = await userSdk.core.paginatedUsers({
-      bookmark: cursor,
-      query,
-      limit,
-    })
-
-    if (!page.data?.length) {
-      break
+  const dedupedUsers = new Map<string, User>()
+  for (const user of [
+    ...workspaceUsers,
+    ...globalPermissionUsers,
+    ...groupUsers,
+  ]) {
+    if (user?._id) {
+      dedupedUsers.set(user._id, user)
     }
+  }
 
-    await hydrateGroupAccess(page.data)
+  let filtered = [...dedupedUsers.values()].filter(hasWorkspaceAccess)
 
-    for (const user of page.data) {
-      if (!hasWorkspaceAccess(user)) {
-        continue
-      }
-      filtered.push(user)
-      if (filtered.length === limit + 1) {
-        nextPage = getBookmarkValue(user)
-        break
-      }
-    }
+  if (query) {
+    filtered = dataFilters.search(filtered, { query }).rows
+  }
 
-    if (filtered.length === limit + 1 || !page.hasNextPage) {
-      break
+  filtered.sort((userA, userB) => {
+    if (query?.string?.email) {
+      const emailA = userA.email?.toLowerCase() || ""
+      const emailB = userB.email?.toLowerCase() || ""
+      if (emailA !== emailB) {
+        return emailA.localeCompare(emailB)
+      }
     }
-    cursor = page.nextPage
-  }
+    return (userA._id || "").localeCompare(userB._id || "")
+  })
 
-  const hasNextPage = filtered.length > limit
-  const data = hasNextPage ? filtered.slice(0, limit) : filtered
+  const bookmark = body.bookmark
+  const pagedUsers = bookmark
+    ? filtered.filter(user => (getBookmarkValue(user) || "") >= bookmark)
+    : filtered
+  const pageData = pagedUsers.slice(0, limit + 1)
+  const hasNextPage = pageData.length > limit
+  const data = hasNextPage ? pageData.slice(0, limit) : pageData
+  const nextPage = hasNextPage ? getBookmarkValue(pageData[limit]) : undefined
 
   for (let user of data) {
     if (user) {

package/src/api/routes/global/tests/users.spec.ts

@@ -2,6 +2,7 @@ import { InviteUsersResponse, OIDCUser, User } from "@budibase/types"
 
 import { accounts as _accounts, events, tenancy } from "@budibase/backend-core"
 import { mocks as featureMocks } from "@budibase/backend-core/tests"
+import { sdk as proSdk } from "@budibase/pro"
 import * as userSdk from "../../../../sdk/users"
 import { TestConfiguration, mocks, structures } from "../../../../tests"
 
@@ -919,6 +920,49 @@ describe("/api/global/users", () => {
       expect(response.body.data.length).toBe(0)
     })
 
+    it("should include users with workspace access via groups", async () => {
+      const workspaceId = "app_workspace_filter_group"
+      const email = structures.users.newEmail()
+      featureMocks.licenses.useUnlimited()
+      const group = await config.doInTenant(() =>
+        proSdk.groups.save({
+          ...structures.groups.UserGroup(),
+          roles: { [workspaceId]: "BASIC" },
+        })
+      )
+
+      await config.createUser({
+        email,
+        userGroups: [group.id],
+      })
+
+      const response = await config.api.users.searchUsers({
+        workspaceId,
+        query: { string: { email } },
+      })
+
+      expect(response.body.data.length).toBe(1)
+      expect(response.body.data[0].email).toBe(email)
+    })
+
+    it("should include global admins in workspace search", async () => {
+      const workspaceId = "app_workspace_filter_global_admin"
+      const email = structures.users.newEmail()
+      await config.createUser({
+        email,
+        admin: { global: true },
+        builder: { global: true },
+      })
+
+      const response = await config.api.users.searchUsers({
+        workspaceId,
+        query: { string: { email } },
+      })
+
+      expect(response.body.data.length).toBe(1)
+      expect(response.body.data[0].email).toBe(email)
+    })
+
     it("should return no users when workspaceId is empty", async () => {
       const email = structures.users.newEmail()
       await config.createUser({ email })

package/src/environment.ts

@@ -101,9 +101,6 @@ const environment = {
   PASSWORD_RESET_RATE_IP_WINDOW_SECONDS:
     parseIntSafe(process.env.PASSWORD_RESET_RATE_IP_WINDOW_SECONDS) || 900,
 
-  // Budibase AI
-  BUDIBASE_AI_API_KEY: process.env.BUDIBASE_AI_API_KEY,
-  BUDIBASE_AI_DEFAULT_MODEL: process.env.BUDIBASE_AI_DEFAULT_MODEL,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore