Skip to content

Commit 4eb4fe7

Browse files
committed
fix(audit-log): credential-set org IDs, workspace deletion FK, actorId fallback, string literal action
1 parent 7e394ad commit 4eb4fe7

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

apps/sim/app/api/credential-sets/[id]/invite/route.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
177177
})
178178

179179
recordAudit({
180-
workspaceId: result.set.organizationId,
180+
workspaceId: null,
181181
actorId: session.user.id,
182182
action: AuditAction.CREDENTIAL_SET_INVITATION_CREATED,
183183
resourceType: AuditResourceType.CREDENTIAL_SET,
@@ -250,7 +250,7 @@ export async function DELETE(req: NextRequest, { params }: { params: Promise<{ i
250250
)
251251

252252
recordAudit({
253-
workspaceId: result.set.organizationId,
253+
workspaceId: null,
254254
actorId: session.user.id,
255255
action: AuditAction.CREDENTIAL_SET_INVITATION_REVOKED,
256256
resourceType: AuditResourceType.CREDENTIAL_SET,

apps/sim/app/api/credential-sets/[id]/members/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export async function DELETE(req: NextRequest, { params }: { params: Promise<{ i
179179
})
180180

181181
recordAudit({
182-
workspaceId: result.set.organizationId,
182+
workspaceId: null,
183183
actorId: session.user.id,
184184
action: AuditAction.CREDENTIAL_SET_MEMBER_REMOVED,
185185
resourceType: AuditResourceType.CREDENTIAL_SET,

apps/sim/app/api/credential-sets/[id]/route.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export async function PUT(req: NextRequest, { params }: { params: Promise<{ id:
133133
const [updated] = await db.select().from(credentialSet).where(eq(credentialSet.id, id)).limit(1)
134134

135135
recordAudit({
136-
workspaceId: result.set.organizationId,
136+
workspaceId: null,
137137
actorId: session.user.id,
138138
action: AuditAction.CREDENTIAL_SET_UPDATED,
139139
resourceType: AuditResourceType.CREDENTIAL_SET,
@@ -190,7 +190,7 @@ export async function DELETE(req: NextRequest, { params }: { params: Promise<{ i
190190
logger.info('Deleted credential set', { credentialSetId: id, userId: session.user.id })
191191

192192
recordAudit({
193-
workspaceId: result.set.organizationId,
193+
workspaceId: null,
194194
actorId: session.user.id,
195195
action: AuditAction.CREDENTIAL_SET_DELETED,
196196
resourceType: AuditResourceType.CREDENTIAL_SET,

apps/sim/app/api/credential-sets/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ export async function POST(req: Request) {
167167
})
168168

169169
recordAudit({
170-
workspaceId: organizationId,
170+
workspaceId: null,
171171
actorId: session.user.id,
172172
action: AuditAction.CREDENTIAL_SET_CREATED,
173173
resourceType: AuditResourceType.CREDENTIAL_SET,

apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { and, eq } from 'drizzle-orm'
1818
import { type NextRequest, NextResponse } from 'next/server'
1919
import { z } from 'zod'
2020
import { getEmailSubject, renderInvitationEmail } from '@/components/emails'
21-
import { AuditResourceType, recordAudit } from '@/lib/audit/log'
21+
import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
2222
import { getSession } from '@/lib/auth'
2323
import { hasAccessControlAccess } from '@/lib/billing'
2424
import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage'
@@ -556,7 +556,10 @@ export async function PUT(
556556
recordAudit({
557557
workspaceId: null,
558558
actorId: session.user.id,
559-
action: status === 'accepted' ? 'org_invitation.accepted' : 'org_invitation.updated',
559+
action:
560+
status === 'accepted'
561+
? AuditAction.ORG_INVITATION_ACCEPTED
562+
: AuditAction.ORG_INVITATION_UPDATED,
560563
resourceType: AuditResourceType.ORGANIZATION,
561564
resourceId: organizationId,
562565
actorName: session.user.name ?? undefined,

apps/sim/app/api/workflows/[id]/deploy/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export async function DELETE(
341341

342342
recordAudit({
343343
workspaceId: workflowData?.workspaceId || null,
344-
actorId: session?.user?.id || '',
344+
actorId: session!.user.id,
345345
actorName: session?.user?.name,
346346
actorEmail: session?.user?.email,
347347
action: AuditAction.WORKFLOW_UNDEPLOYED,

apps/sim/app/api/workspaces/[id]/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ export async function DELETE(
283283
})
284284

285285
recordAudit({
286-
workspaceId,
286+
workspaceId: null,
287287
actorId: session.user.id,
288288
actorName: session.user.name,
289289
actorEmail: session.user.email,

0 commit comments

Comments
 (0)