fix(mcp): pass workspaceId to OAuth start + preserve client secret on edit

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

Author: waleedlatif1

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

@@ -328,6 +328,7 @@ export function McpServerFormModal({
   const [headerScrollLeft, setHeaderScrollLeft] = useState<Record<string, number>>({})
 
   const [showAdvanced, setShowAdvanced] = useState(false)
+  const [oauthClientSecretTouched, setOauthClientSecretTouched] = useState(false)
 
   const [prevOpen, setPrevOpen] = useState(false)
   if (open && !prevOpen) {
@@ -345,6 +346,7 @@ export function McpServerFormModal({
     setUrlScrollLeft(0)
     setHeaderScrollLeft({})
     setShowAdvanced(!!(data.oauthClientId || data.oauthClientSecret))
+    setOauthClientSecretTouched(false)
   }
   if (open !== prevOpen) {
     setPrevOpen(open)
@@ -538,7 +540,11 @@ export function McpServerFormModal({
         timeout: formData.timeout || 30000,
         oauthClientId: mode === 'edit' ? (oauthClientId ?? '') : oauthClientId || undefined,
         oauthClientSecret:
-          mode === 'edit' ? (oauthClientSecret ?? '') : oauthClientSecret || undefined,
+          mode === 'edit'
+            ? oauthClientSecretTouched
+              ? (oauthClientSecret ?? '')
+              : undefined
+            : oauthClientSecret || undefined,
       })
 
       onOpenChange(false)
@@ -549,7 +555,17 @@ export function McpServerFormModal({
     } finally {
       setIsSubmitting(false)
     }
-  }, [formData, isFormValid, isDomainBlocked, testConnection, workspaceId, onSubmit, onOpenChange])
+  }, [
+    formData,
+    isFormValid,
+    isDomainBlocked,
+    testConnection,
+    workspaceId,
+    onSubmit,
+    onOpenChange,
+    mode,
+    oauthClientSecretTouched,
+  ])
 
   const handleSubmitJson = useCallback(async () => {
     const config = parseJsonConfig(jsonInput)
@@ -735,6 +751,7 @@ export function McpServerFormModal({
                       onChange={(e) => {
                         if (testResult) clearTestResult()
                         if (submitError) setSubmitError(null)
+                        setOauthClientSecretTouched(true)
                         setFormData((prev) => ({ ...prev, oauthClientSecret: e.target.value }))
                       }}
                       className='h-9'

apps/sim/app/workspace/[workspaceId]/settings/components/mcp/mcp.tsx

@@ -467,7 +467,10 @@ export function MCP({ initialServerId }: MCPProps) {
                     onClick={async () => {
                       setConnectingOauthServers((prev) => new Set(prev).add(server.id))
                       try {
-                        await startOauthMutation.mutateAsync({ serverId: server.id })
+                        await startOauthMutation.mutateAsync({
+                          serverId: server.id,
+                          workspaceId,
+                        })
                       } catch (e) {
                         logger.error('Failed to start MCP OAuth', e)
                         toast.error(

apps/sim/hooks/queries/mcp.ts

@@ -179,9 +179,11 @@ export function useCreateMcpServer() {
  * `data.status === 'already_authorized'` means valid tokens already exist.
  */
 export function useStartMcpOauth() {
-  return useMutation<StartMcpOauthResult, Error, { serverId: string }>({
-    mutationFn: async ({ serverId }) => {
-      const result = await requestJson(startMcpOauthContract, { query: { serverId } })
+  return useMutation<StartMcpOauthResult, Error, { serverId: string; workspaceId: string }>({
+    mutationFn: async ({ serverId, workspaceId }) => {
+      const result = await requestJson(startMcpOauthContract, {
+        query: { serverId, workspaceId },
+      })
       if (result.status === 'redirect') {
         const popup = window.open(
           result.authorizationUrl,

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

@@ -400,6 +400,7 @@ export const testMcpServerConnectionContract = defineRouteContract({
 
 export const startMcpOauthQuerySchema = z.object({
   serverId: z.string().min(1, 'serverId is required'),
+  workspaceId: z.string().min(1, 'workspaceId is required'),
 })
 
 export const startMcpOauthResultSchema = z.discriminatedUnion('status', [