Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
8242d3b
feat(mcp): OAuth 2.1 + PKCE for outbound MCP servers
waleedlatif1 May 5, 2026
4a2d759
fix(mcp): address PR review for OAuth feature
waleedlatif1 May 5, 2026
a493c87
fix(mcp): promote authType + clear OAuth tokens on credential change
waleedlatif1 May 5, 2026
6c26267
fix(mcp): compare decrypted plaintext for OAuth client secret change
waleedlatif1 May 5, 2026
df8d4fe
fix(mcp): trigger OAuth auto-detection probe for empty headers object
waleedlatif1 May 5, 2026
bb866d5
fix(mcp): catch redirect-required error in execute + always test on save
waleedlatif1 May 5, 2026
7598fea
fix(mcp): treat UnauthorizedError as disconnected in service discover…
waleedlatif1 May 5, 2026
1f75dda
fix(mcp): allow clearing OAuth credentials in edit + filter deleted s…
waleedlatif1 May 5, 2026
b218df1
fix(mcp): pass workspaceId to OAuth start + preserve client secret on…
waleedlatif1 May 5, 2026
b3f00b1
fix(mcp): pass workspaceId on auto-start OAuth after server create
waleedlatif1 May 5, 2026
7c118a6
fix(mcp): normalize empty/null when detecting OAuth client id change
waleedlatif1 May 5, 2026
be9dcba
fix(mcp): tighten 401 detection, hash OAuth state at rest
waleedlatif1 May 5, 2026
6268e0a
fix(mcp): allow OAuth flow for DCR-only servers; detect secret-only e…
waleedlatif1 May 5, 2026
d11842e
fix(mcp): clear OAuth tokens on POST upsert; validate https; OAuthCli…
waleedlatif1 May 5, 2026
ddff00f
fix(mcp): clear execution timeout to avoid timer leak; redact callbac…
waleedlatif1 May 5, 2026
729e413
fix(mcp): keep OAuth spinner until popup closes; remove dead comments
waleedlatif1 May 5, 2026
7f40f7d
fix(mcp): clear OAuth tokens on server revival; clear popup intervals…
waleedlatif1 May 5, 2026
42922d9
chore(mcp): drop redundant useCallback from startOauthForServer
waleedlatif1 May 5, 2026
1760100
chore(mcp): align with React Query and design-token best practices
waleedlatif1 May 5, 2026
e4b4f07
chore(mcp): drop unobserved useCallback/useMemo, simplify state
waleedlatif1 May 5, 2026
1fd382e
fix(mcp): preserve custom headers for OAuth servers; atomic PATCH + t…
waleedlatif1 May 5, 2026
3402b9b
fix(mcp): wrap POST upsert delete+update in transaction
waleedlatif1 May 5, 2026
3f3dc1c
fix(mcp): preserve oauthClientSecret on POST upsert when not provided
waleedlatif1 May 5, 2026
24076ad
fix(mcp): include serverId in OAuth postMessage; honor stored secret …
waleedlatif1 May 5, 2026
2dfa127
fix(mcp): preserve authType on URL-unchanged upserts; fallback server…
waleedlatif1 May 5, 2026
346e45d
fix(mcp): mark OAuth-pending servers disconnected so reauth UI surfaces
waleedlatif1 May 5, 2026
c33f688
chore(mcp): cleanup pass; unique OAuth popup name per server
waleedlatif1 May 5, 2026
55e223e
fix(mcp): forward serverId on callback failure; allow loopback http
waleedlatif1 May 5, 2026
8c9c6ff
chore(db): drop OAuth migration; will regenerate post-rebase
waleedlatif1 May 6, 2026
1e2efd1
chore(db): regenerate MCP OAuth migration as 0205 post-rebase
waleedlatif1 May 6, 2026
1f9f357
refactor(mcp): cleanup pass — emcn buttons, derived state, OAuth head…
waleedlatif1 May 6, 2026
536208a
chore(mcp): final audit pass — strip restated TSDoc and narration com…
waleedlatif1 May 6, 2026
5a1fba1
fix(mcp): address PR review — shared OAuth popup hook, PATCH symmetry…
waleedlatif1 May 6, 2026
b8364ac
fix(mcp): use canonical serverId from contract; drop dual-semantics s…
waleedlatif1 May 6, 2026
cf7e2a7
fix(mcp): stable mutateAsync dep + preserve OAuth connection on no-op…
waleedlatif1 May 6, 2026
ea1c7b4
fix(mcp): final audit fixes — state TTL, authProvider guard, decrypt …
waleedlatif1 May 6, 2026
be03225
added envvar resolution, fixed UI for the data drains, added screensh…
waleedlatif1 May 7, 2026
e051547
added tests, made oauth mcp servers workspace scoped
waleedlatif1 May 7, 2026
67b5cb6
upgrade turbo
waleedlatif1 May 7, 2026
5c4c68d
chore(ci): update API validation route baseline
waleedlatif1 May 7, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/docs/content/docs/en/enterprise/data-drains.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Drains are independent of [Data Retention](/enterprise/data-retention) but desig

Go to **Settings → Enterprise → Data Drains** in your workspace, then click **New drain**.

![Data Drains settings page showing two configured drains — one exporting workflow logs to Amazon S3 daily, another exporting Copilot chats to an HTTPS webhook hourly](/static/enterprise/data-drains-list.png)

![New data drain dialog with fields for name, source, cadence, destination, and S3 credentials](/static/enterprise/data-drains-new.png)

Each drain has four pieces:

1. A **source** — the category of data to export
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 123 additions & 0 deletions apps/sim/app/api/mcp/oauth/callback/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
import { auth as mcpAuth } from '@modelcontextprotocol/sdk/client/auth.js'
import { db } from '@sim/db'
import { mcpServers } from '@sim/db/schema'
import { createLogger } from '@sim/logger'
import { toError } from '@sim/utils/errors'
import { and, eq, isNull } from 'drizzle-orm'
import type { NextRequest } from 'next/server'
import { NextResponse } from 'next/server'
import { getSession } from '@/lib/auth'
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
import {
clearState,
clearVerifier,
loadOauthRowByState,
loadPreregisteredClient,
SimMcpOauthProvider,
} from '@/lib/mcp/oauth'
import { mcpService } from '@/lib/mcp/service'

const logger = createLogger('McpOauthCallbackAPI')

export const dynamic = 'force-dynamic'

function escapeHtml(value: string): string {
return value
.replace(/&/g, '&')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;')
}

function htmlClose(message: string, ok: boolean, serverId?: string): NextResponse {
const safeMessage = escapeHtml(message)
const title = ok ? 'Connected' : 'Connection failed'
const serverIdLiteral = serverId
? JSON.stringify(serverId).replace(/</g, '\\u003c').replace(/>/g, '\\u003e')
: 'undefined'
const body = `<!doctype html><html><head><meta charset="utf-8"><title>${title}</title></head><body style="font-family: system-ui; padding: 24px"><p>${safeMessage}</p><script>
try { window.opener && window.opener.postMessage({ type: 'mcp-oauth', ok: ${ok ? 'true' : 'false'}, serverId: ${serverIdLiteral} }, window.location.origin) } catch (e) {}
setTimeout(function () { window.close() }, 800)
</script></body></html>`
Comment thread
waleedlatif1 marked this conversation as resolved.
Comment thread
waleedlatif1 marked this conversation as resolved.
return new NextResponse(body, {
headers: { 'Content-Type': 'text/html; charset=utf-8' },
})
}

export const GET = withRouteHandler(async (request: NextRequest) => {
const url = new URL(request.url)
const state = url.searchParams.get('state')
const code = url.searchParams.get('code')
const errorParam = url.searchParams.get('error')

if (errorParam) {
logger.warn(`MCP OAuth callback received error: ${errorParam}`)
return htmlClose(`Authorization failed: ${errorParam}`, false)
}
if (!state || !code) {
return htmlClose('Missing state or code in callback URL.', false)
}

let serverId: string | undefined
try {
const session = await getSession()
if (!session?.user?.id) {
return htmlClose('You must be signed in to complete authorization.', false)
}

const row = await loadOauthRowByState(state)
if (!row) {
return htmlClose('Invalid or expired authorization state.', false)
}
serverId = row.mcpServerId

if (session.user.id !== row.userId) {
return htmlClose(
'You must be signed in as the same user that initiated the flow.',
false,
serverId
)
}

const [server] = await db
.select({ id: mcpServers.id, url: mcpServers.url, workspaceId: mcpServers.workspaceId })
.from(mcpServers)
.where(and(eq(mcpServers.id, row.mcpServerId), isNull(mcpServers.deletedAt)))
.limit(1)
if (!server || !server.url) {
return htmlClose('Server no longer exists.', false, serverId)
}
Comment thread
waleedlatif1 marked this conversation as resolved.

// Burn state before token exchange so a replayed callback cannot reuse it.
await clearState(row.id)

const preregistered = await loadPreregisteredClient(server.id)
const provider = new SimMcpOauthProvider({ row, preregistered })
let result: Awaited<ReturnType<typeof mcpAuth>>
try {
result = await mcpAuth(provider, {
serverUrl: server.url,
authorizationCode: code,
})
} finally {
await clearVerifier(row.id)
}

if (result !== 'AUTHORIZED') {
return htmlClose('Authorization did not complete.', false, server.id)
}

try {
await mcpService.clearCache(server.workspaceId)
await mcpService.discoverServerTools(session.user.id, server.id, server.workspaceId)
} catch (e) {
logger.warn('Post-auth tools refresh failed', toError(e).message)
}

return htmlClose('Connected. You can close this window.', true, server.id)
} catch (error) {
logger.error('MCP OAuth callback failed', error)
return htmlClose('Authorization failed. Please try again.', false, serverId)
}
Comment thread
waleedlatif1 marked this conversation as resolved.
})
152 changes: 152 additions & 0 deletions apps/sim/app/api/mcp/oauth/start/route.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
/**
* @vitest-environment node
*/
import {
dbChainMock,
dbChainMockFns,
hybridAuthMock,
hybridAuthMockFns,
permissionsMock,
permissionsMockFns,
resetDbChainMock,
schemaMock,
} from '@sim/testing'
import { NextRequest } from 'next/server'
import { beforeEach, describe, expect, it, vi } from 'vitest'

const {
mockMcpAuth,
mockGetOrCreateOauthRow,
mockLoadPreregisteredClient,
mockSetOauthRowUser,
MockMcpOauthRedirectRequired,
} = vi.hoisted(() => ({
mockMcpAuth: vi.fn(),
mockGetOrCreateOauthRow: vi.fn(),
mockLoadPreregisteredClient: vi.fn(),
mockSetOauthRowUser: vi.fn(),
MockMcpOauthRedirectRequired: class MockMcpOauthRedirectRequired extends Error {
constructor(public readonly authorizationUrl: string) {
super('redirect required')
}
},
}))

vi.mock('@sim/db', () => dbChainMock)
vi.mock('@sim/db/schema', () => schemaMock)
vi.mock('drizzle-orm', () => ({
and: vi.fn(),
eq: vi.fn(),
isNull: vi.fn(),
}))
vi.mock('@modelcontextprotocol/sdk/client/auth.js', () => ({
auth: mockMcpAuth,
}))
vi.mock('@/lib/auth/hybrid', () => hybridAuthMock)
vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock)
vi.mock('@/lib/mcp/oauth', () => ({
getOrCreateOauthRow: mockGetOrCreateOauthRow,
loadPreregisteredClient: mockLoadPreregisteredClient,
McpOauthRedirectRequired: MockMcpOauthRedirectRequired,
setOauthRowUser: mockSetOauthRowUser,
SimMcpOauthProvider: vi.fn().mockImplementation((value) => value),
}))

import { GET } from './route'

describe('MCP OAuth start route', () => {
beforeEach(() => {
vi.clearAllMocks()
resetDbChainMock()
hybridAuthMockFns.mockCheckSessionOrInternalAuth.mockResolvedValue({
success: true,
userId: 'user-2',
userName: 'User Two',
userEmail: 'user2@example.com',
authType: 'session',
})
permissionsMockFns.mockGetUserEntityPermissions.mockResolvedValue('write')
dbChainMockFns.limit.mockResolvedValue([
{
id: 'server-1',
name: 'Exa',
url: 'https://mcp.exa.ai/mcp',
workspaceId: 'workspace-1',
authType: 'oauth',
deletedAt: null,
},
])
mockGetOrCreateOauthRow.mockResolvedValue({
id: 'oauth-row-1',
mcpServerId: 'server-1',
userId: 'user-1',
workspaceId: 'workspace-1',
clientInformation: null,
tokens: null,
codeVerifier: null,
state: null,
updatedAt: new Date(),
})
mockLoadPreregisteredClient.mockResolvedValue(undefined)
mockMcpAuth.mockRejectedValue(new MockMcpOauthRedirectRequired('https://mcp.exa.ai/authorize'))
})

it('requires workspace write permission via MCP auth middleware', async () => {
const request = new NextRequest(
'http://localhost:3000/api/mcp/oauth/start?workspaceId=workspace-1&serverId=server-1'
)

await GET(request)

expect(permissionsMockFns.mockGetUserEntityPermissions).toHaveBeenCalledWith(
'user-2',
'workspace',
'workspace-1'
)
})

it('uses a workspace-scoped OAuth row and stamps the latest authorizing user', async () => {
const request = new NextRequest(
'http://localhost:3000/api/mcp/oauth/start?workspaceId=workspace-1&serverId=server-1'
)

const response = await GET(request)
const body = await response.json()

expect(response.status).toBe(200)
expect(body).toEqual({
status: 'redirect',
authorizationUrl: 'https://mcp.exa.ai/authorize',
})
expect(mockGetOrCreateOauthRow).toHaveBeenCalledWith({
mcpServerId: 'server-1',
userId: 'user-2',
workspaceId: 'workspace-1',
})
expect(mockSetOauthRowUser).toHaveBeenCalledWith('oauth-row-1', 'user-2')
})

it('rejects a second user starting OAuth while another authorization is active', async () => {
mockGetOrCreateOauthRow.mockResolvedValueOnce({
id: 'oauth-row-1',
mcpServerId: 'server-1',
userId: 'user-1',
workspaceId: 'workspace-1',
clientInformation: null,
tokens: null,
codeVerifier: null,
state: 'hashed-active-state',
updatedAt: new Date(),
})
const request = new NextRequest(
'http://localhost:3000/api/mcp/oauth/start?workspaceId=workspace-1&serverId=server-1'
)

const response = await GET(request)
const body = await response.json()

expect(response.status).toBe(409)
expect(body.error).toBe('OAuth authorization already in progress for this server')
expect(mockMcpAuth).not.toHaveBeenCalled()
})
})
109 changes: 109 additions & 0 deletions apps/sim/app/api/mcp/oauth/start/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
import { auth as mcpAuth } from '@modelcontextprotocol/sdk/client/auth.js'
import { db } from '@sim/db'
import { mcpServers } from '@sim/db/schema'
import { createLogger } from '@sim/logger'
import { toError } from '@sim/utils/errors'
import { and, eq, isNull } from 'drizzle-orm'
import type { NextRequest } from 'next/server'
import { NextResponse } from 'next/server'
import { startMcpOauthQuerySchema } from '@/lib/api/contracts/mcp'
import { validationErrorResponse } from '@/lib/api/server'
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
import { withMcpAuth } from '@/lib/mcp/middleware'
import {
getOrCreateOauthRow,
loadPreregisteredClient,
McpOauthRedirectRequired,
SimMcpOauthProvider,
setOauthRowUser,
} from '@/lib/mcp/oauth'
import { createMcpErrorResponse } from '@/lib/mcp/utils'

const logger = createLogger('McpOauthStartAPI')
const OAUTH_START_TTL_MS = 10 * 60 * 1000

export const dynamic = 'force-dynamic'

export const GET = withRouteHandler(
withMcpAuth('write')(async (request: NextRequest, { userId, workspaceId, requestId }) => {
try {
const queryResult = startMcpOauthQuerySchema.safeParse(
Object.fromEntries(new URL(request.url).searchParams)
)
if (!queryResult.success) {
return validationErrorResponse(queryResult.error)
}
const { serverId } = queryResult.data

const [server] = await db
.select()
.from(mcpServers)
.where(
and(
eq(mcpServers.id, serverId),
eq(mcpServers.workspaceId, workspaceId),
isNull(mcpServers.deletedAt)
)
)
.limit(1)

if (!server) {
return createMcpErrorResponse(new Error('Server not found'), 'Server not found', 404)
}
if (server.authType !== 'oauth') {
return createMcpErrorResponse(
new Error(`Server authType is "${server.authType}", not oauth`),
'Server is not configured for OAuth',
400
)
}
if (!server.url) {
return createMcpErrorResponse(new Error('Server has no URL'), 'Missing server URL', 400)
}

const row = await getOrCreateOauthRow({
mcpServerId: server.id,
userId,
workspaceId,
})
const hasActiveFlow = !!row.state && row.updatedAt.getTime() > Date.now() - OAUTH_START_TTL_MS
if (hasActiveFlow && row.userId && row.userId !== userId) {
return createMcpErrorResponse(
new Error('OAuth authorization already in progress'),
'OAuth authorization already in progress for this server',
409
)
}
if (row.userId !== userId) {
await setOauthRowUser(row.id, userId)
row.userId = userId
}
const preregistered = await loadPreregisteredClient(server.id)
const provider = new SimMcpOauthProvider({ row, preregistered })

try {
const result = await mcpAuth(provider, { serverUrl: server.url })
if (result === 'AUTHORIZED') {
return NextResponse.json({ status: 'already_authorized' })
}
return createMcpErrorResponse(
new Error('Provider did not capture redirect URL'),
'Failed to start OAuth flow',
500
)
} catch (e) {
if (e instanceof McpOauthRedirectRequired) {
logger.info(`[${requestId}] OAuth redirect for server ${serverId}`)
return NextResponse.json({
status: 'redirect',
authorizationUrl: e.authorizationUrl,
})
}
throw e
}
} catch (error) {
logger.error(`[${requestId}] Error starting MCP OAuth flow:`, error)
return createMcpErrorResponse(toError(error), 'Failed to start OAuth flow', 500)
}
})
)
Loading