address comments

Author: icecrasher321

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

@@ -168,18 +168,21 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
       }
     })
 
+    const isOrgScoped = inv.kind === 'organization'
+    const primaryWorkspaceId = inv.grants[0]?.workspaceId ?? null
     recordAudit({
-      workspaceId: null,
+      workspaceId: isOrgScoped ? null : primaryWorkspaceId,
       actorId: session.user.id,
       actorName: session.user.name ?? undefined,
       actorEmail: session.user.email ?? undefined,
-      action: AuditAction.ORG_INVITATION_UPDATED,
-      resourceType: AuditResourceType.ORGANIZATION,
-      resourceId: inv.organizationId ?? inv.id,
-      description: `Updated invitation for ${inv.email}`,
+      action: isOrgScoped ? AuditAction.ORG_INVITATION_UPDATED : AuditAction.INVITATION_UPDATED,
+      resourceType: isOrgScoped ? AuditResourceType.ORGANIZATION : AuditResourceType.WORKSPACE,
+      resourceId: isOrgScoped ? (inv.organizationId ?? inv.id) : (primaryWorkspaceId ?? inv.id),
+      description: `Updated ${inv.kind} invitation for ${inv.email}`,
       metadata: {
         invitationId: id,
         targetEmail: inv.email,
+        kind: inv.kind,
         roleUpdate: role ?? null,
         grantUpdates: grantsToApply,
       },

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

@@ -395,12 +395,15 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     }
 
     if (failedInvitations.length > 0) {
-      return NextResponse.json({
-        success: false,
-        error: 'Some invitation emails failed to send.',
-        message: `${sentInvitations.length} invitation(s) sent, ${failedInvitations.length} failed`,
-        data: responseData,
-      })
+      return NextResponse.json(
+        {
+          success: false,
+          error: 'Some invitation emails failed to send.',
+          message: `${sentInvitations.length} invitation(s) sent, ${failedInvitations.length} failed`,
+          data: responseData,
+        },
+        { status: 207 }
+      )
     }
 
     return NextResponse.json({

apps/sim/lib/audit/types.ts

@@ -73,6 +73,7 @@ export const AuditAction = {
   INVITATION_REJECTED: 'invitation.rejected',
   INVITATION_RESENT: 'invitation.resent',
   INVITATION_REVOKED: 'invitation.revoked',
+  INVITATION_UPDATED: 'invitation.updated',
 
   // Knowledge Base Connectors
   CONNECTOR_CREATED: 'connector.created',

packages/testing/src/mocks/audit.mock.ts

@@ -77,6 +77,7 @@ export const auditMock = {
     INVITATION_REJECTED: 'invitation.rejected',
     INVITATION_RESENT: 'invitation.resent',
     INVITATION_REVOKED: 'invitation.revoked',
+    INVITATION_UPDATED: 'invitation.updated',
     CONNECTOR_CREATED: 'connector.created',
     CONNECTOR_UPDATED: 'connector.updated',
     CONNECTOR_DELETED: 'connector.deleted',