@budibase/worker 3.31.2 → 3.31.4

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.2",
+  "version": "3.31.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -91,23 +91,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": "e43a157f7b7baa20d67d05b35fd94b2b205acb2b"
+  "gitHead": "7d5a486a8c245870743408abb7d03a33e19c8679"
 }

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/groups.ts

@@ -14,6 +14,19 @@ import {
 } from "@budibase/types"
 import { db, groups, users as usersSdk } from "@budibase/pro"
 
+const DEFAULT_PAGE_SIZE = 10
+
+function parsePageSize(pageSize: unknown) {
+  if (pageSize === undefined || pageSize === null) {
+    return DEFAULT_PAGE_SIZE
+  }
+  const parsedPageSize = Number(pageSize)
+  if (!Number.isFinite(parsedPageSize) || parsedPageSize < 1) {
+    return DEFAULT_PAGE_SIZE
+  }
+  return Math.floor(parsedPageSize)
+}
+
 export async function save(ctx: UserCtx) {
   const group: UserGroup = ctx.request.body
   group.name = group.name.trim()
@@ -101,7 +114,8 @@ export async function find(ctx: UserCtx) {
 }
 
 export async function searchUsers(ctx: Ctx<{}, SearchUserGroupResponse>) {
-  const { pageSize = 10, bookmark, emailSearch } = ctx.request.query as any
+  const { bookmark, emailSearch } = ctx.request.query as any
+  const pageSize = parsePageSize((ctx.request.query as any).pageSize)
   const groupId = ctx.params.groupId
 
   const params: DatabaseQueryOpts = { limit: pageSize + 1 }

package/src/api/controllers/global/tests/groups.spec.ts

@@ -0,0 +1,84 @@
+jest.mock("@budibase/pro", () => ({
+  db: {
+    groups: {
+      getGroupUsers: jest.fn(),
+    },
+  },
+  groups: {},
+  users: {},
+  csv: {},
+}))
+
+import { db } from "@budibase/pro"
+import { searchUsers } from "../groups"
+
+const createCtx = (pageSize: string): Parameters<typeof searchUsers>[0] =>
+  ({
+    request: {
+      query: {
+        pageSize,
+      },
+    },
+    params: {
+      groupId: "group_1",
+    },
+    body: undefined,
+  }) as unknown as Parameters<typeof searchUsers>[0]
+
+describe("Global groups controller", () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it("coerces pageSize query param to a number before computing limit", async () => {
+    const getGroupUsers = db.groups.getGroupUsers as jest.Mock
+    getGroupUsers.mockResolvedValue(
+      Array.from({ length: 6 }).map((_, i) => ({
+        _id: `user_${i}`,
+        email: `user_${i}@example.com`,
+      }))
+    )
+
+    const ctx = createCtx("5")
+
+    await searchUsers(ctx)
+
+    expect(getGroupUsers).toHaveBeenCalledWith("group_1", {
+      limit: 6,
+      emailSearch: undefined,
+      bookmark: undefined,
+    })
+    expect(ctx.body).toEqual({
+      users: [
+        { _id: "user_0", email: "user_0@example.com" },
+        { _id: "user_1", email: "user_1@example.com" },
+        { _id: "user_2", email: "user_2@example.com" },
+        { _id: "user_3", email: "user_3@example.com" },
+        { _id: "user_4", email: "user_4@example.com" },
+      ],
+      bookmark: "user_5",
+      hasNextPage: true,
+    })
+  })
+
+  it("falls back to the default page size for invalid query values", async () => {
+    const getGroupUsers = db.groups.getGroupUsers as jest.Mock
+    getGroupUsers.mockResolvedValue(
+      Array.from({ length: 11 }).map((_, i) => ({
+        _id: `user_${i}`,
+        email: `user_${i}@example.com`,
+      }))
+    )
+
+    const ctx = createCtx("not-a-number")
+
+    await searchUsers(ctx)
+
+    expect(getGroupUsers).toHaveBeenCalledWith("group_1", {
+      limit: 11,
+      emailSearch: undefined,
+      bookmark: undefined,
+    })
+    expect(ctx.body.users).toHaveLength(10)
+  })
+})

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