Skip to content

Commit c9118e7

Browse files
icecrasher321TheodoreSpeakswaleedlatif1
authored
feat(files): folders, multiselect, vfs update (#4572)
* v0.6.29: login improvements, posthog telemetry (#4026) * feat(posthog): Add tracking on mothership abort (#4023) Co-authored-by: Theodore Li <theo@sim.ai> * fix(login): fix captcha headers for manual login (#4025) * fix(signup): fix turnstile key loading * fix(login): fix captcha header passing * Catch user already exists, remove login form captcha * feat(files): folders + vfs update * address comments * address comments * cleanup unnused code * address comments * perf improvements * address next set * cycle detect * error handling * path improvements * cleanup, best practices * react query best practices: targeted invalidation, optimistic updates, key factory hierarchy - Add workspaceLists(workspaceId) intermediate key level to both workspaceFilesKeys and workspaceFileFolderKeys so invalidation targets only the affected workspace instead of all workspaces - Replace all lists() invalidation calls with workspaceLists(workspaceId) across every mutation (upload, rename, delete, restore, update content, folder mutations) - Add optimistic updates to useRenameWorkspaceFile and useUpdateWorkspaceFileFolder with onMutate snapshot, onError rollback, onSettled reconciliation - Move storage key into the content() factory as optional param so query keys are always built through the factory (useWorkspaceFileContent, useWorkspaceFileBinary) - Fix AnimatePresence wrapping in FilesActionBar so exit animation fires on deselect - Fix ResourceColGroup to use percentage weights instead of pixel widths to prevent horizontal scroll on narrow viewports * add shift-click range selection and selection-aware context menu for files - Extend SelectableConfig.onSelectRow with optional shiftKey param; DataRow captures shiftKey before onCheckedChange fires via a ref so the Radix Checkbox interaction chain stays intact - Implement shift-click range selection in files.tsx using lastSelectedIndexRef; tracks last-selected index in visibleRowIds to compute the range - Reset lastSelectedIndexRef on deselect and select-all - Add selectedCount prop to FileRowContextMenu; hide Open and Rename when multiple items are selected, show "Delete N items" / "Download N items" labels in multi-select mode * add Move submenu to file context menu and fix shift-click anchor update - Add nested Move submenu to FileRowContextMenu using DropdownMenuSub/SubTrigger/SubContent; shows available folders filtered by selection, converts '__root__' -> null for moving to the root level - Add handleContextMenuMove in files.tsx that calls moveItems.mutateAsync directly (no modal) and clears selection on success - Fix shift-click range selection: update lastSelectedIndexRef after range select so chained shift-clicks extend from the new anchor point correctly * fix move submenu: use folder names with tree-ordered indentation instead of stale paths - Compute folder depth from parentId chain client-side (avoids stale server-computed path field) - Tree-order folders so parents appear before their children, sorted by sortOrder then name - Show folder.name instead of folder.path so optimistic renames are reflected immediately - Indent each folder by depth * 12px in the submenu so po/shit renders as 'shit' indented under 'po' - MoveOption gains optional depth field; contextMenuMoveOptions is a separate memo from moveFolderOptions (modal keeps its existing path-label behavior) * fix shift-click anchor drift and remove dead stopPropagation constant - Remove dead stopPropagation const in resource.tsx (replaced by handleSelectRowClick) - Reset lastSelectedIndexRef when visibleRowIds changes so search/filter/folder navigation doesn't leave a stale anchor that produces wrong ranges on the next shift-click - Update lastSelectedIndexRef in handleRowContextMenu when right-clicking resets selection to a single item, so the anchor matches the newly-selected row - Add visibleRowIds to handleRowContextMenu deps (now reads it to compute anchor index) - Remove moveItems.mutateAsync from handleContextMenuMove deps per project convention (.mutateAsync is stable in TanStack v5) * complete workspace files feature: audit logs, posthog events, folder restore, empty state, keyboard shortcuts, storage indicator, breadcrumb rename - Audit + PostHog: wire file_renamed, file_deleted, file_moved, file_bulk_deleted, folder_created, folder_renamed, folder_deleted, folder_moved events to all file/folder API routes - Add AuditAction.FOLDER_UPDATED, FILE_MOVED, FOLDER_MOVED to audit types - Folder restore: server function, contract, API route (POST /files/folders/[folderId]/restore), hook (useRestoreWorkspaceFileFolder), Recently Deleted integration with new File Folders tab - Empty state: contextual emptyMessage passed to <Resource> based on search/filters/folder context - Keyboard shortcuts: Delete/Backspace deletes selection, Escape deselects, Cmd+A selects all (list view only, input-aware guard) - Storage indicator: useStorageInfo drives compact "used / limit" display in file list header via leadingActions - Breadcrumb rename: current folder breadcrumb gains Rename dropdown + inline editing via breadcrumbRename (useInlineRename) - Resource: thread leadingActions prop from ResourceProps to ResourceHeader * cleanup: accessibility, emcn design tokens, react best practices across workspace UI - Add sr-only ModalDescription to dialogs/modals for accessibility - Replace hardcoded colors and z-indices with design token CSS variables - Apply emcn design review fixes across tables, knowledge, logs, settings, workflows * fix audit and posthog: FOLDER_RESTORED action on restore, fire folder_moved event separately from file_moved * sidebar: add Files section with nested folder tree; polish move UX and cleanup - Files section in sidebar shows folder/file tree with expand/collapse, matching Workflows section structure; collapsed sidebar shows flyout menu - Move action bar now uses nested DropdownMenuSub tree instead of flat modal - Context menu and action bar share renderMoveOption from move-options.tsx - FolderInput added to emcn icons barrel; all FolderInput imports migrated - Drag ghost uses CSS vars (--border, --shadow-medium, --z-toast) - Selection pruning converted from useEffect to render-time comparison - Keyboard listener stabilized with handleBulkDeleteRef pattern - toError() used consistently in restore and move route handlers * remove Files section from sidebar * restore Files nav item in sidebar workspace section * fix infinite re-render on files page - revert selection pruning to useEffect * add filefolder resource type for ingesting workspace file folders * export filefolder tree types; add toast feedback for file/folder mutations * regenerate migration as 0208 after rebase onto staging * add workspaceFileFolder to schema mock * add FILE_MOVED, FOLDER_MOVED, FOLDER_UPDATED to audit mock * add filefolder ChatContext kind and wire through schema and resolver * add filefolder to AgentContextType * add filefolder to chat context kind registry; fix resolver to use workspaceFiles table * add .deepsec to gitignore * cleanup: effect, emcn tokens, mutation error handling - Replace selection-pruning useEffect with inline state adjustment during render - Fix drag overlay using invalid --accent HSL token → --brand-secondary; z-50 → z-[var(--z-dropdown)] - Move static inline styles on context menu trigger div to className - Add missing onError toast to useUpdateWorkspaceFileFolder, useRestoreWorkspaceFileFolder, useRestoreWorkspaceFile * lint * fix: remove duplicate handleCopilotStopGeneration from rebase * feat(copilot): folder-aware file context in WORKSPACE.md * feat(copilot): add move operation to file manage API * fix(files): make targetFolder optional in move file contract * perf(files): parallelize buffer fetches, fix N+1 folder queries, stabilize drag useMemo - download route: fan out all fetchWorkspaceFileBuffer calls with Promise.all before zip assembly so 100 files resolve in one round-trip instead of sequentially - getWorkspaceFileFolder: replace per-ancestor SELECTs with a single workspace-wide folder load + buildWorkspaceFileFolderPathMap, making depth irrelevant to query count - ensureWorkspaceFileFolderPath: pre-load all workspace folders in one SELECT before the segment loop; resolve existing segments from an in-memory map; only hit the DB to CREATE missing segments; conflict retry path preserved and also updates the map - files.tsx rowDragDropConfig: move activeDropTargetId into a ref so the useMemo does not recompute on every drag-over event * fix(files): remove files/ path stripping, fix stale path in optimistic update - splitWorkspaceFilePath: remove the unconditional .replace(/^files\//, '') that clobbered paths for files inside a folder literally named "files" - useUpdateWorkspaceFileFolder: when a name update is in flight, recompute the path field for the renamed folder (replace last segment) and propagate the new prefix to all descendant folders so breadcrumbs stay correct during the optimistic window * fix(files): revert broken ref opt, clean 409 on restore, null parentId on orphaned restore - files.tsx: revert the activeDropTargetId ref optimization — the ref doesn't trigger re-renders so the drop-target highlight never updated during drag; activeDropTargetId is back in state and in the rowDragDropConfig deps - restore/route.ts: catch Postgres 23505 unique-constraint violation and return a clean 409 instead of leaking the raw error as 400 - restoreWorkspaceFileFolder: check if the parent folder is still archived before restoring; if it is, restore to root (parentId: null) so the folder is never orphaned under an archived parent * feat(search): show folder path for files in cmd-k modal, strip extraneous comments - FileItem interface with folderPath?: string[] added to search modal utils - MemoizedFileItem component renders folder breadcrumb identically to MemoizedWorkflowItem — truncated path segments on the right with / separators - FilesGroup rewritten as a dedicated memo component (was createIconGroup factory) so it accepts FileItem[] and includes folderPath segments in the search value - searchModalFiles in sidebar splits f.folderPath string into string[] segments - search-modal.tsx typed to FileItem and includes folderPath in filterAndSort - Remove self-explanatory "Phase 1" section label from download route - Remove redundant TSDoc on the unique index in db schema * fix(workspace-files): audit fixes — transaction, status codes, contract refinements, guards * fix(vfs): pass folderPath separately so buildWorkspaceMd groups files correctly * fix(types): narrow unknown fileInput with Record cast after object guard * fix(routes): replace instanceof Error with toError() across new workspace file routes * improvement(files): cleanup pass — remove unnecessary useCallbacks, consolidate emcn icon imports - Remove useCallback from 5 drag-event handlers in DataRow (passed to native <tr> elements, no observer) - Remove stable useCallback fns from 3 useMemo deps arrays in files.tsx (editingId/editValue remain) - Merge all @/components/emcn/icons subpath imports into barrel (files.tsx, action-bar, file-row-context-menu) * fix(files): apply activeSort to folders, reject drop onto current parent folder - visibleFolders now respects activeSort column (name/updated/created) and direction so folder ordering stays consistent with file ordering - isInvalidDropTarget now returns true when all dragged items are already direct children of the target folder, preventing a no-op move mutation * fix breadcrumb * add new tools to rename, create, delete folders * move more ui actions into orchestration dir * address comments * fix params * fix tests * address comments * improve error codes * address comments * address more nits * fix mcp server error code --------- Co-authored-by: Theodore Li <theodoreqili@gmail.com> Co-authored-by: waleed <walif6@gmail.com>
1 parent bad21cb commit c9118e7

205 files changed

Lines changed: 11101 additions & 3412 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,4 @@ i18n.cache
8484
.claude/launch.json
8585
.claude/worktrees/
8686
.claude/scheduled_tasks.lock
87+
.deepsec/

‎apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
Modal,
1111
ModalClose,
1212
ModalContent,
13+
ModalDescription,
1314
ModalTitle,
1415
ModalTrigger,
1516
} from '@/components/emcn'
@@ -134,6 +135,9 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
134135
<ModalTitle className='sr-only'>
135136
{view === 'login' ? 'Log in' : 'Create account'}
136137
</ModalTitle>
138+
<ModalDescription className='sr-only'>
139+
{view === 'login' ? 'Sign in to your account' : 'Create a new account'}
140+
</ModalDescription>
137141

138142
<div className='relative px-6 pt-6 pb-6'>
139143
<ModalClose className='absolute top-6 right-6 rounded-sm opacity-70 transition-opacity hover:opacity-100'>

‎apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
Modal,
99
ModalBody,
1010
ModalContent,
11+
ModalDescription,
1112
ModalFooter,
1213
ModalHeader,
1314
ModalTrigger,
@@ -152,6 +153,9 @@ export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalP
152153
}
153154
>
154155
<ModalBody>
156+
<ModalDescription className='sr-only'>
157+
Fill out this form to request a demo and talk to the sales team
158+
</ModalDescription>
155159
<div className='space-y-3'>
156160
<div className='grid gap-3 sm:grid-cols-2'>
157161
<LandingField htmlFor='firstName' label='First name' error={errors.firstName}>

‎apps/sim/app/(landing)/integrations/components/request-integration-modal.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
Modal,
99
ModalBody,
1010
ModalContent,
11+
ModalDescription,
1112
ModalFooter,
1213
ModalHeader,
1314
Textarea,
@@ -83,6 +84,9 @@ export function RequestIntegrationModal() {
8384

8485
{status === 'success' ? (
8586
<ModalBody>
87+
<ModalDescription className='sr-only'>
88+
Integration request submitted successfully
89+
</ModalDescription>
8690
<div className='flex flex-col items-center gap-3 py-6 text-center'>
8791
<div className='flex size-10 items-center justify-center rounded-full bg-[#33C482]/10'>
8892
<svg
@@ -106,6 +110,10 @@ export function RequestIntegrationModal() {
106110
) : (
107111
<form onSubmit={handleSubmit} className='flex min-h-0 flex-1 flex-col'>
108112
<ModalBody>
113+
<ModalDescription className='sr-only'>
114+
Submit a request for a new integration by entering the integration name and your
115+
email
116+
</ModalDescription>
109117
<div className='space-y-3'>
110118
<div className='flex flex-col gap-1'>
111119
<Label htmlFor='integration-name'>Integration name</Label>

‎apps/sim/app/api/credentials/[id]/route.ts‎

Lines changed: 34 additions & 241 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
21
import { db } from '@sim/db'
3-
import { credential, credentialMember, environment, workspaceEnvironment } from '@sim/db/schema'
2+
import { credential, credentialMember } from '@sim/db/schema'
43
import { createLogger } from '@sim/logger'
5-
import { generateId } from '@sim/utils/id'
64
import { and, eq } from 'drizzle-orm'
75
import { type NextRequest, NextResponse } from 'next/server'
86
import { updateWorkspaceCredentialContract } from '@/lib/api/contracts/credentials'
97
import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
108
import { getSession } from '@/lib/auth'
11-
import { encryptSecret } from '@/lib/core/security/encryption'
129
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
1310
import { getCredentialActorContext } from '@/lib/credentials/access'
14-
import { deleteCredential } from '@/lib/credentials/deletion'
15-
import {
16-
deleteWorkspaceEnvCredentials,
17-
syncPersonalEnvCredentialsForUser,
18-
} from '@/lib/credentials/environment'
19-
import { captureServerEvent } from '@/lib/posthog/server'
11+
import { performDeleteCredential, performUpdateCredential } from '@/lib/credentials/orchestration'
2012

2113
const logger = createLogger('CredentialByIdAPI')
2214

@@ -93,93 +85,33 @@ export const PUT = withRouteHandler(
9385
const { id } = parsed.data.params
9486
const body = parsed.data.body
9587

96-
const access = await getCredentialActorContext(id, session.user.id)
97-
if (!access.credential) {
98-
return NextResponse.json({ error: 'Credential not found' }, { status: 404 })
99-
}
100-
if (!access.hasWorkspaceAccess || !access.isAdmin) {
101-
return NextResponse.json({ error: 'Credential admin permission required' }, { status: 403 })
102-
}
103-
104-
const updates: Record<string, unknown> = {}
105-
106-
if (body.description !== undefined) {
107-
updates.description = body.description ?? null
108-
}
109-
110-
if (
111-
body.displayName !== undefined &&
112-
(access.credential.type === 'oauth' || access.credential.type === 'service_account')
113-
) {
114-
updates.displayName = body.displayName
115-
}
116-
117-
if (body.serviceAccountJson !== undefined && access.credential.type === 'service_account') {
118-
let parsedJson: Record<string, unknown>
119-
try {
120-
parsedJson = JSON.parse(body.serviceAccountJson)
121-
} catch {
122-
return NextResponse.json({ error: 'Invalid JSON format' }, { status: 400 })
123-
}
124-
if (
125-
parsedJson.type !== 'service_account' ||
126-
typeof parsedJson.client_email !== 'string' ||
127-
typeof parsedJson.private_key !== 'string' ||
128-
typeof parsedJson.project_id !== 'string'
129-
) {
130-
return NextResponse.json({ error: 'Invalid service account JSON key' }, { status: 400 })
131-
}
132-
const { encrypted } = await encryptSecret(body.serviceAccountJson)
133-
updates.encryptedServiceAccountKey = encrypted
134-
}
135-
136-
if (Object.keys(updates).length === 0) {
137-
if (access.credential.type === 'oauth' || access.credential.type === 'service_account') {
138-
return NextResponse.json(
139-
{
140-
error: 'No updatable fields provided.',
141-
},
142-
{ status: 400 }
143-
)
144-
}
145-
return NextResponse.json(
146-
{
147-
error:
148-
'Environment credentials cannot be updated via this endpoint. Use the environment value editor in credentials settings.',
149-
},
150-
{ status: 400 }
151-
)
152-
}
153-
154-
updates.updatedAt = new Date()
155-
await db.update(credential).set(updates).where(eq(credential.id, id))
156-
157-
recordAudit({
158-
workspaceId: access.credential.workspaceId,
159-
actorId: session.user.id,
88+
const result = await performUpdateCredential({
89+
credentialId: id,
90+
userId: session.user.id,
16091
actorName: session.user.name,
16192
actorEmail: session.user.email,
162-
action: AuditAction.CREDENTIAL_UPDATED,
163-
resourceType: AuditResourceType.CREDENTIAL,
164-
resourceId: id,
165-
resourceName: access.credential.displayName,
166-
description: `Updated ${access.credential.type} credential "${access.credential.displayName}"`,
167-
metadata: {
168-
credentialType: access.credential.type,
169-
updatedFields: Object.keys(updates).filter((k) => k !== 'updatedAt'),
170-
},
93+
displayName: body.displayName,
94+
description: body.description,
95+
serviceAccountJson: body.serviceAccountJson,
17196
request,
17297
})
98+
if (!result.success) {
99+
const status =
100+
result.errorCode === 'not_found'
101+
? 404
102+
: result.errorCode === 'forbidden'
103+
? 403
104+
: result.errorCode === 'conflict'
105+
? 409
106+
: result.errorCode === 'validation'
107+
? 400
108+
: 500
109+
return NextResponse.json({ error: result.error }, { status })
110+
}
173111

174112
const row = await getCredentialResponse(id, session.user.id)
175113
return NextResponse.json({ credential: row }, { status: 200 })
176114
} catch (error) {
177-
if (error instanceof Error && error.message.includes('unique')) {
178-
return NextResponse.json(
179-
{ error: 'A service account credential with this name already exists in the workspace' },
180-
{ status: 409 }
181-
)
182-
}
183115
logger.error('Failed to update credential', error)
184116
return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
185117
}
@@ -196,163 +128,24 @@ export const DELETE = withRouteHandler(
196128
const { id } = await params
197129

198130
try {
199-
const access = await getCredentialActorContext(id, session.user.id)
200-
if (!access.credential) {
201-
return NextResponse.json({ error: 'Credential not found' }, { status: 404 })
202-
}
203-
if (!access.hasWorkspaceAccess || !access.isAdmin) {
204-
return NextResponse.json({ error: 'Credential admin permission required' }, { status: 403 })
205-
}
206-
207-
if (access.credential.type === 'env_personal' && access.credential.envKey) {
208-
const ownerUserId = access.credential.envOwnerUserId
209-
if (!ownerUserId) {
210-
return NextResponse.json({ error: 'Invalid personal secret owner' }, { status: 400 })
211-
}
212-
213-
const [personalRow] = await db
214-
.select({ variables: environment.variables })
215-
.from(environment)
216-
.where(eq(environment.userId, ownerUserId))
217-
.limit(1)
218-
219-
const current = ((personalRow?.variables as Record<string, string> | null) ?? {}) as Record<
220-
string,
221-
string
222-
>
223-
if (access.credential.envKey in current) {
224-
delete current[access.credential.envKey]
225-
}
226-
227-
await db
228-
.insert(environment)
229-
.values({
230-
id: ownerUserId,
231-
userId: ownerUserId,
232-
variables: current,
233-
updatedAt: new Date(),
234-
})
235-
.onConflictDoUpdate({
236-
target: [environment.userId],
237-
set: { variables: current, updatedAt: new Date() },
238-
})
239-
240-
await syncPersonalEnvCredentialsForUser({
241-
userId: ownerUserId,
242-
envKeys: Object.keys(current),
243-
})
244-
245-
captureServerEvent(
246-
session.user.id,
247-
'credential_deleted',
248-
{
249-
credential_type: 'env_personal',
250-
provider_id: access.credential.envKey,
251-
workspace_id: access.credential.workspaceId,
252-
},
253-
{ groups: { workspace: access.credential.workspaceId } }
254-
)
255-
256-
recordAudit({
257-
workspaceId: access.credential.workspaceId,
258-
actorId: session.user.id,
259-
actorName: session.user.name,
260-
actorEmail: session.user.email,
261-
action: AuditAction.CREDENTIAL_DELETED,
262-
resourceType: AuditResourceType.CREDENTIAL,
263-
resourceId: id,
264-
resourceName: access.credential.displayName,
265-
description: `Deleted personal env credential "${access.credential.envKey}"`,
266-
metadata: { credentialType: 'env_personal', envKey: access.credential.envKey },
267-
request,
268-
})
269-
270-
return NextResponse.json({ success: true }, { status: 200 })
271-
}
272-
273-
if (access.credential.type === 'env_workspace' && access.credential.envKey) {
274-
const [workspaceRow] = await db
275-
.select({
276-
id: workspaceEnvironment.id,
277-
createdAt: workspaceEnvironment.createdAt,
278-
variables: workspaceEnvironment.variables,
279-
})
280-
.from(workspaceEnvironment)
281-
.where(eq(workspaceEnvironment.workspaceId, access.credential.workspaceId))
282-
.limit(1)
283-
284-
const current = ((workspaceRow?.variables as Record<string, string> | null) ??
285-
{}) as Record<string, string>
286-
if (access.credential.envKey in current) {
287-
delete current[access.credential.envKey]
288-
}
289-
290-
await db
291-
.insert(workspaceEnvironment)
292-
.values({
293-
id: workspaceRow?.id || generateId(),
294-
workspaceId: access.credential.workspaceId,
295-
variables: current,
296-
createdAt: workspaceRow?.createdAt || new Date(),
297-
updatedAt: new Date(),
298-
})
299-
.onConflictDoUpdate({
300-
target: [workspaceEnvironment.workspaceId],
301-
set: { variables: current, updatedAt: new Date() },
302-
})
303-
304-
await deleteWorkspaceEnvCredentials({
305-
workspaceId: access.credential.workspaceId,
306-
removedKeys: [access.credential.envKey],
307-
})
308-
309-
captureServerEvent(
310-
session.user.id,
311-
'credential_deleted',
312-
{
313-
credential_type: 'env_workspace',
314-
provider_id: access.credential.envKey,
315-
workspace_id: access.credential.workspaceId,
316-
},
317-
{ groups: { workspace: access.credential.workspaceId } }
318-
)
319-
320-
recordAudit({
321-
workspaceId: access.credential.workspaceId,
322-
actorId: session.user.id,
323-
actorName: session.user.name,
324-
actorEmail: session.user.email,
325-
action: AuditAction.CREDENTIAL_DELETED,
326-
resourceType: AuditResourceType.CREDENTIAL,
327-
resourceId: id,
328-
resourceName: access.credential.displayName,
329-
description: `Deleted workspace env credential "${access.credential.envKey}"`,
330-
metadata: { credentialType: 'env_workspace', envKey: access.credential.envKey },
331-
request,
332-
})
333-
334-
return NextResponse.json({ success: true }, { status: 200 })
335-
}
336-
337-
await deleteCredential({
131+
const result = await performDeleteCredential({
338132
credentialId: id,
339-
actorId: session.user.id,
133+
userId: session.user.id,
340134
actorName: session.user.name,
341135
actorEmail: session.user.email,
342-
reason: 'user_delete',
343136
request,
344137
})
345-
346-
captureServerEvent(
347-
session.user.id,
348-
'credential_deleted',
349-
{
350-
credential_type: access.credential.type as 'oauth' | 'service_account',
351-
provider_id: access.credential.providerId ?? id,
352-
workspace_id: access.credential.workspaceId,
353-
},
354-
{ groups: { workspace: access.credential.workspaceId } }
355-
)
138+
if (!result.success) {
139+
const status =
140+
result.errorCode === 'not_found'
141+
? 404
142+
: result.errorCode === 'forbidden'
143+
? 403
144+
: result.errorCode === 'validation'
145+
? 400
146+
: 500
147+
return NextResponse.json({ error: result.error }, { status })
148+
}
356149

357150
return NextResponse.json({ success: true }, { status: 200 })
358151
} catch (error) {

0 commit comments

Comments
 (0)