@budibase/worker 3.31.3 → 3.31.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.31.3",
+  "version": "3.31.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,6 +37,7 @@
     "@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",
@@ -47,19 +48,28 @@
     "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"
   },
@@ -69,6 +79,7 @@
     "@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",
@@ -80,5 +91,5 @@
     "supertest": "6.3.3",
     "timekeeper": "2.2.0"
   },
-  "gitHead": "7f5947eadcf2e540ae7e9334ef8f160be64fea2e"
+  "gitHead": "8b6307f21fc1e0496119295b4417d57e13857c6a"
 }

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)
+  })
+})