fix(mcp): let non-creator users OAuth into OBO-mode MCP servers from the Tools page

[tin-berri]

Problem

• Other admins/users on the platform are unable to OAuth with MCP Tools in OBO-mode
• Root Cause = Tools page doesn't check for user's credentials in DB and default to failure (no tools showing)

Fix

• Added check for DB credentials (given their user_id)
• If user does not have stored credentials in the DB, surface the authorize button to allow them to OAuth with the MCP server and store their credentials in our LiteLLM_UserMCPCredentials DB Table.

Linear ticket

Resolves LIT-3628

Pre-Submission checklist

Please complete all items before asking a LiteLLM maintainer to review your PR

• I have added meaningful tests
• My PR passes all unit tests on make test-unit
• My PR's scope is as isolated as possible; it only solves 1 specific problem
• I have requested a Greptile review by commenting @greptileai and received a Confidence Score of at least 4/5 before requesting a maintainer review

CI (LiteLLM team)

• Branch creation CI run
  Link:

• CI run for the last commit
  Link:

• Merge / cherry-pick CI run
  Links:

Screenshots / Proof of Fix

Tested E2E with 2 different users being able to reauthorize on the MCP Playground Tools list + Claude desktop integration of Slack MCP to send messages

Manual verification on a running proxy with an OBO-mode MCP server (oauth2, interactive, delegate_auth_to_upstream false), as a user who did not create the server:

1. Log into the dashboard as a user (SSO or their own virtual key, not the shared master key) who has no stored credential for the server
2. Go to MCP Servers -> the OBO server -> MCP Tools. Before this change the page showed "No tools available" with no way to authorize; now it shows an Authorize button
3. Click Authorize, complete the upstream login, and you land back on the Tools tab with the tools listed
4. Confirm a row was written, keyed to that user: SELECT user_id, server_id FROM "LiteLLM_MCPUserCredentials" WHERE server_id = '<server_id>'
5. Let the access token expire (or wait past its lifetime) and reopen the Tools tab; tools still load with no reauthorize prompt, since the list call refreshes from the stored refresh_token

Type

🐛 Bug Fix

Changes

The MCP Servers Tools tab only ever surfaced an authorize gate for PKCE passthrough servers. An OBO server with no stored per-user credential therefore listed nothing and gave the user no way to authorize: the backend looked up their per-user token, found none, sent no token upstream, and the upstream 401 was swallowed into an empty tool list

For OBO servers the Tools tab now checks whether the calling user has a stored credential via the oauth-user-credential/status endpoint. When a row exists it lists tools, relying on resolve_valid_user_oauth_token to refresh an expired token from the stored refresh_token on the list call; when no row exists it shows an Authorize button wired to useUserMcpOAuthFlow, the same redirect+exchange flow as the chat Connect and admin "Authorize & Fetch" buttons, which persists the access and refresh token to the per-user DB keyed to the user's user_id. Passthrough and M2M behavior are unchanged, and an existing-but-expired credential no longer forces a needless reauthorize

Because the flow is a full-page OAuth redirect, the Tools tab stashes the server id before redirecting and the MCP Servers page reopens that server on the Tools tab on return, so useUserMcpOAuthFlow re-mounts and completes the credential store. This mirrors the admin edit flow's restore via EDIT_OAUTH_UI_STATE_KEY

A follow-up commit hardens two cases from review. The post-redirect Tools-tab reopen is now a one-shot: the stashed server id is cleared when the user navigates back to the server list, so re-selecting that same server later opens Overview by default instead of jumping back to the Tools tab. And the credential-status check now surfaces the Authorize gate when the status request itself fails, rather than leaving a silent empty tool list; re-authorizing only overwrites the user's own row, so it is safe even when a credential did exist

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

[greptile-apps]

Greptile Summary

This PR fixes the MCP Servers Tools tab for non-creator users on OBO-mode servers: previously, no per-user credential meant the backend returned nothing and the UI had no way to prompt authorization; now the Tools tab checks the oauth-user-credential/status endpoint and shows an Authorize gate when no credential row exists, wiring the button to useUserMcpOAuthFlow. The server ID is stashed in sessionStorage before the redirect so the page can reopen the correct server on the Tools tab after the IdP callback.

• OBO credential gate in mcp_tools.tsx: oboNeedsAuth is true when the status query returns has_credential: false OR errors out, preventing the pre-fix silent-empty-tools state; expired-but-stored credentials are not re-gated.
• Redirect-return restoration in mcp_servers.tsx: TOOLS_OAUTH_UI_STATE_KEY is read once via a lazy useState initializer, cleaned up on mount, and handleBack clears toolsTabServerId so normal navigation defaults back to the Overview tab.
• Test coverage: four new cases cover credential-present, no-credential, status-check-failure, and expired-credential paths; passthrough and M2M paths assert the credential-status endpoint is never called.

Confidence Score: 5/5

Safe to merge; the OBO gate logic is correct and well-covered by the new tests, with no regressions to passthrough or M2M paths.

All three OAuth modes are exercised by the updated test suite and the mode-selection logic is mutually exclusive. The credential-status error path now surfaces an Authorize button rather than a silent empty list. The two suggestions are quality improvements, not correctness issues.

No files require special attention; the most complex logic is in mcp_tools.tsx and is thoroughly exercised by the tests.

Important Files Changed

Filename	Overview
ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx	Core change: adds OBO credential-status gate for non-creator users. Logic is sound; oboNeedsAuth correctly includes isOboCredError so failures surface the Authorize button. Loading flicker is prevented via oboStatusLoading.
ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx	Adds toolsTabServerId state to reopen the Tools tab after the OBO OAuth redirect. The value is consumed via a lazy useState initialiser and the sessionStorage key is cleaned up unconditionally on mount.
ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.test.tsx	Replaces the OBO-never-gates test with four new cases covering: credential present, no credential, status-check failure, and expired-but-still-valid credential.
ui/litellm-dashboard/src/components/mcp_tools/mcp_server_view.tsx	Minimal change: adds optional initialTabIndex prop (default 0) wired to the selectedTabIndex useState initialiser.
ui/litellm-dashboard/src/hooks/mcpOAuthUtils.ts	Exports the new TOOLS_OAUTH_UI_STATE_KEY constant and JSDoc describing its purpose. No logic changes to existing helpers.

_{Reviews (3): Last reviewed commit: "fix(ui): clear OBO Tools-tab one-shot on..." | Re-trigger Greptile}

[CLAassistant]

All committers have signed the CLA.

[tin-berri]

@greptileai review this pr

[mateo-berri]

LGTM; thanks!