fix(mcp): allow clearing OAuth credentials in edit + filter deleted servers in callback

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/app/api/mcp/oauth/callback/route.ts

@@ -3,7 +3,7 @@ import { db } from '@sim/db'
 import { mcpServers } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
-import { eq } from 'drizzle-orm'
+import { and, eq, isNull } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
@@ -74,7 +74,7 @@ export const GET = withRouteHandler(async (request: NextRequest) => {
     const [server] = await db
       .select({ id: mcpServers.id, url: mcpServers.url, workspaceId: mcpServers.workspaceId })
       .from(mcpServers)
-      .where(eq(mcpServers.id, row.mcpServerId))
+      .where(and(eq(mcpServers.id, row.mcpServerId), isNull(mcpServers.deletedAt)))
       .limit(1)
     if (!server || !server.url) {
       return htmlClose('Server no longer exists.', false)

apps/sim/app/api/mcp/servers/[id]/route.ts

@@ -61,6 +61,9 @@ export const PATCH = withRouteHandler(
             ? (await encryptSecret(oauthClientSecret)).encrypted
             : null
         }
+        if (updateData.oauthClientId !== undefined) {
+          finalUpdateData.oauthClientId = updateData.oauthClientId || null
+        }
 
         if (updateData.url) {
           try {

apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx

@@ -536,8 +536,9 @@ export function McpServerFormModal({
         url: formData.url!,
         headers,
         timeout: formData.timeout || 30000,
-        oauthClientId: oauthClientId || undefined,
-        oauthClientSecret: oauthClientSecret || undefined,
+        oauthClientId: mode === 'edit' ? (oauthClientId ?? '') : oauthClientId || undefined,
+        oauthClientSecret:
+          mode === 'edit' ? (oauthClientSecret ?? '') : oauthClientSecret || undefined,
       })
 
       onOpenChange(false)

apps/sim/lib/api/contracts/mcp.ts

@@ -135,8 +135,8 @@ export const createMcpServerBodySchema = z
     enabled: z.boolean().optional(),
     source: z.string().optional(),
     workspaceId: z.string().optional(),
-    oauthClientId: z.string().optional(),
-    oauthClientSecret: z.string().optional(),
+    oauthClientId: z.string().nullable().optional(),
+    oauthClientSecret: z.string().nullable().optional(),
   })
   .passthrough()