Skip to content

fix(mcp): pass OAuthClientProvider to call_mcp_tool for automatic token refresh #9267

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

Closed
Fizza-Mukhtar wants to merge 5 commits into from
Closed

fix(mcp): pass OAuthClientProvider to call_mcp_tool for automatic token refresh #9267

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ef0dad
fix(mcp): pass OAuthClientProvider to call_mcp_tool for automatic tok…
Fizza-Mukhtar Mar 11, 2026
d4c0905
fix(mcp): remove trailing whitespace and add reconnect to auth error …
Fizza-Mukhtar Mar 11, 2026
498a14d
fix(mcp): add SSE warning log and use exact reconnect error string
Fizza-Mukhtar Mar 11, 2026
58047d9
style(mcp): add OAuthClientProvider import for explicit type annotation
Fizza-Mukhtar Mar 11, 2026
75b24ff
style: fix import ordering for OAuthClientProvider
Fizza-Mukhtar Mar 11, 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
1 change: 1 addition & 0 deletions backend/onyx/tools/tool_constructor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ def construct_tools(
tool_definition=saved_tool.mcp_input_schema or {},
connection_config=connection_config,
user_email=user_email,
user_id=str(user.id),
user_oauth_token=mcp_user_oauth_token,
additional_headers=additional_mcp_headers,
)
Expand Down
30 changes: 30 additions & 0 deletions backend/onyx/tools/tool_implementations/mcp/mcp_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ def __init__(
tool_definition: dict[str, Any],
connection_config: MCPConnectionConfig | None = None,
user_email: str = "",
user_id: str = "",
user_oauth_token: str | None = None,
additional_headers: dict[str, str] | None = None,
) -> None:
Expand All @@ -56,6 +57,7 @@ def __init__(
self.mcp_server = mcp_server
self.connection_config = connection_config
self.user_email = user_email
self._user_id = user_id
self._user_oauth_token = user_oauth_token
self._additional_headers = additional_headers or {}

Expand Down Expand Up @@ -199,12 +201,39 @@ def run(
llm_facing_response=llm_facing_response,
)

# For OAuth servers, construct OAuthClientProvider so the MCP SDK
# can refresh expired tokens automatically
auth = None
Comment thread
Fizza-Mukhtar marked this conversation as resolved.
Resolved
if (
self.mcp_server.auth_type == MCPAuthenticationType.OAUTH
and self.connection_config is not None
and self._user_id
):
if self.mcp_server.transport == MCPTransport.SSE:
logger.warning(
f"MCP tool '{self._name}': OAuth token refresh is not supported "
f"for SSE transport — auth provider will be ignored. "
f"Re-authentication may be required after token expiry."
)
else:
from onyx.server.features.mcp.api import UNUSED_RETURN_PATH
from onyx.server.features.mcp.api import make_oauth_provider

auth = make_oauth_provider(
self.mcp_server,
self._user_id,
UNUSED_RETURN_PATH,
self.connection_config.id,
None,
)
Comment thread
Fizza-Mukhtar marked this conversation as resolved.
Resolved

tool_result = call_mcp_tool(
self.mcp_server.server_url,
self._name,
llm_kwargs,
connection_headers=headers,
transport=self.mcp_server.transport or MCPTransport.STREAMABLE_HTTP,
auth=auth,
)

logger.info(f"MCP tool '{self._name}' executed successfully")
Expand Down Expand Up @@ -249,6 +278,7 @@ def run(
"invalid token",
"invalid api key",
"invalid credentials",
"please reconnect to the server",
]

is_auth_error = any(
Expand Down
Loading