From a77cc77be8ad1db98a4e55577b1b8b86c331dc62 Mon Sep 17 00:00:00 2001 From: x032205 Date: Sat, 17 May 2025 03:15:22 -0400 Subject: [PATCH] explicitly pass values --- .../ee/services/audit-log/audit-log-types.ts | 2 +- .../src/server/routes/v1/project-router.ts | 25 +++++++++++++++---- .../src/server/routes/v2/project-router.ts | 23 +++++++++++++++-- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.ts index 2b2fe1f4c..7793cd97f 100644 --- a/backend/src/ee/services/audit-log/audit-log-types.ts +++ b/backend/src/ee/services/audit-log/audit-log-types.ts @@ -2917,7 +2917,7 @@ interface OrgUpdateEvent { interface ProjectCreateEvent { type: EventType.CREATE_PROJECT; - metadata: Record; // The creation parameters + metadata: Record; // The creation parameters } interface ProjectUpdateEvent { diff --git a/backend/src/server/routes/v1/project-router.ts b/backend/src/server/routes/v1/project-router.ts index 8a2e74e74..11fb63ef4 100644 --- a/backend/src/server/routes/v1/project-router.ts +++ b/backend/src/server/routes/v1/project-router.ts @@ -406,7 +406,14 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: req.params.workspaceId, event: { type: EventType.UPDATE_PROJECT, - metadata: req.body + metadata: { + ...(req.body.name !== undefined && { name: req.body.name }), + ...(req.body.description !== undefined && { description: req.body.description }), + ...(req.body.autoCapitalization !== undefined && { autoCapitalization: req.body.autoCapitalization }), + ...(req.body.hasDeleteProtection !== undefined && { hasDeleteProtection: req.body.hasDeleteProtection }), + ...(req.body.slug !== undefined && { slug: req.body.slug }), + ...(req.body.secretSharing !== undefined && { secretSharing: req.body.secretSharing }) + } } }); @@ -453,7 +460,9 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: req.params.workspaceId, event: { type: EventType.UPDATE_PROJECT, - metadata: req.body + metadata: { + autoCapitalization: req.body.autoCapitalization + } } }); @@ -501,7 +510,9 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: req.params.workspaceId, event: { type: EventType.UPDATE_PROJECT, - metadata: req.body + metadata: { + hasDeleteProtection: req.body.hasDeleteProtection + } } }); @@ -549,7 +560,9 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: workspace.id, event: { type: EventType.UPDATE_PROJECT, - metadata: req.body + metadata: { + pitVersionLimit: req.body.pitVersionLimit + } } }); @@ -597,7 +610,9 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: workspace.id, event: { type: EventType.UPDATE_PROJECT, - metadata: req.body + metadata: { + auditLogsRetentionDays: req.body.auditLogsRetentionDays + } } }); diff --git a/backend/src/server/routes/v2/project-router.ts b/backend/src/server/routes/v2/project-router.ts index a8778facf..d06a7df47 100644 --- a/backend/src/server/routes/v2/project-router.ts +++ b/backend/src/server/routes/v2/project-router.ts @@ -212,7 +212,21 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: project.id, event: { type: EventType.CREATE_PROJECT, - metadata: req.body + metadata: { + actorId: req.permission.id, + actor: req.permission.type, + actorOrgId: req.permission.orgId, + actorAuthMethod: req.permission.authMethod, + ...(req.body.projectName !== undefined && { workspaceName: req.body.projectName }), + ...(req.body.projectDescription !== undefined && { workspaceDescription: req.body.projectDescription }), + ...(req.body.slug !== undefined && { slug: req.body.slug }), + ...(req.body.kmsKeyId !== undefined && { kmsKeyId: req.body.kmsKeyId }), + ...(req.body.template !== undefined && { template: req.body.template }), + ...(req.body.type !== undefined && { type: req.body.type }), + ...(req.body.shouldCreateDefaultEnvs !== undefined && { + createDefaultEnvs: req.body.shouldCreateDefaultEnvs + }) + } } }); @@ -353,7 +367,12 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { projectId: project.id, event: { type: EventType.UPDATE_PROJECT, - metadata: req.body + metadata: { + ...(req.body.name !== undefined && { name: req.body.name }), + ...(req.body.description !== undefined && { description: req.body.description }), + ...(req.body.autoCapitalization !== undefined && { autoCapitalization: req.body.autoCapitalization }), + ...(req.body.hasDeleteProtection !== undefined && { hasDeleteProtection: req.body.hasDeleteProtection }) + } } });