Skip to content

fix(mcp): resolve userId before JWT generation for agent block auth #3932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 2 commits into from
Apr 4, 2026
+37 −3
Merged

fix(mcp): resolve userId before JWT generation for agent block auth #3932

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7b505f
fix(mcp): resolve userId before JWT generation for agent block auth
waleedlatif1 Apr 4, 2026
f182eb5
test(mcp): add regression test for agent block JWT userId resolution
waleedlatif1 Apr 4, 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
6 changes: 3 additions & 3 deletions apps/sim/tools/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,11 +1552,13 @@ async function executeMcpTool(

const baseUrl = getInternalApiBaseUrl()

const mcpScope = resolveToolScope(params, executionContext)

const headers: Record<string, string> = { 'Content-Type': 'application/json' }

if (typeof window === 'undefined') {
try {
const internalToken = await generateInternalToken(executionContext?.userId)
const internalToken = await generateInternalToken(mcpScope.userId)
headers.Authorization = `Bearer ${internalToken}`
} catch (error) {
logger.error(`[${actualRequestId}] Failed to generate internal token:`, error)
Expand Down Expand Up @@ -1587,8 +1589,6 @@ async function executeMcpTool(
)
}

const mcpScope = resolveToolScope(params, executionContext)

if (mcpScope.callChain && mcpScope.callChain.length > 0) {
headers[SIM_VIA_HEADER] = serializeCallChain(mcpScope.callChain)
}
Expand Down
Loading