diff --git a/docs/api/activity.md b/docs/api/activity.md index 6e43d6db63d..13d9f1c1c86 100644 --- a/docs/api/activity.md +++ b/docs/api/activity.md @@ -15,7 +15,7 @@ Query parameters: | Param | Description | |-------|-------------| -| `agentId` | Filter by actor agent | +| `agentId` | Filter by actor agent. Must be a UUID; an empty value applies no filter. A malformed value returns `400` with validation details. | | `entityType` | Filter by entity type (`issue`, `agent`, `approval`) | | `entityId` | Filter by specific entity | diff --git a/server/src/__tests__/activity-routes.test.ts b/server/src/__tests__/activity-routes.test.ts index 5553bd190fd..99509006d12 100644 --- a/server/src/__tests__/activity-routes.test.ts +++ b/server/src/__tests__/activity-routes.test.ts @@ -296,6 +296,31 @@ describe("activity routes", () => { }); }); + it("rejects malformed agentId filters on company activity lists", async () => { + mockActivityService.list.mockResolvedValue([]); + + const app = await createApp(); + const res = await requestApp(app, (baseUrl) => + request(baseUrl).get("/api/companies/company-1/activity?agentId=dc04285a-"), + ); + + expect(res.status).toBe(400); + expect(mockActivityService.list).not.toHaveBeenCalled(); + }); + + it("passes valid agentId filters to company activity lists", async () => { + mockActivityService.list.mockResolvedValue([]); + const agentId = "dc04285a-1b2c-4d3e-8f90-123456789abc"; + + const app = await createApp(); + const res = await requestApp(app, (baseUrl) => + request(baseUrl).get(`/api/companies/company-1/activity?agentId=${agentId}`), + ); + + expect(res.status).toBe(200); + expect(mockActivityService.list).toHaveBeenCalledWith(expect.objectContaining({ agentId })); + }); + it("caps requested company activity list limits", async () => { mockActivityService.list.mockResolvedValue([]); diff --git a/server/src/routes/activity.ts b/server/src/routes/activity.ts index 765e863ce7c..67ff20fe94f 100644 --- a/server/src/routes/activity.ts +++ b/server/src/routes/activity.ts @@ -104,6 +104,10 @@ const createActivitySchema = z.object({ details: z.record(z.string(), z.unknown()).optional().nullable(), }); +const companyActivityQuerySchema = z.object({ + agentId: z.preprocess((value) => (value === "" ? undefined : value), z.string().guid().optional()), +}); + const agentActionAuditActorScopeSchema = z.enum(["agents", "all"]); const agentActionAuditQuerySchema = z.object({ @@ -233,9 +237,14 @@ export function activityRoutes(db: Db) { assertCompanyAccess(req, companyId); if (!(await assertCompanyScopeReadAllowed(req, res, companyId))) return; + const parsedQuery = companyActivityQuerySchema.safeParse({ agentId: req.query.agentId }); + if (!parsedQuery.success) { + throw badRequest("Invalid activity query", parsedQuery.error.issues); + } + const filters = { companyId, - agentId: req.query.agentId as string | undefined, + agentId: parsedQuery.data.agentId, entityType: req.query.entityType as string | undefined, entityId: req.query.entityId as string | undefined, limit: normalizeActivityLimit(Number(req.query.limit)),