scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-10 03:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 85

fix: use get_cached_byok_credential helper, fix refresh_token truthiness, show disabled button on missing props

Browse source
This commit is contained in:
Ishaan Jaffer 2026-03-07 17:43:07 -08:00
parent 14427f30a4
commit 1248c0a85e
3 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
litellm/proxy/_experimental/mcp_server/openapi_oauth2_endpoints.py
View file

@ -536,7 +536,7 @@ async def openapi_oauth2_callback( # noqa: PLR0915
# token for future renewal without a schema change.
credential_to_store = (
json.dumps({"access_token": access_token, "refresh_token": refresh_token})
if refresh_token
if refresh_token is not None
else access_token
)

54
litellm/proxy/_experimental/mcp_server/server.py
View file

@ -1599,13 +1599,10 @@ if MCP_AVAILABLE:
if not user_id:
return None
cache_key = (user_id, mcp_server.server_id)
cached = _byok_cred_cache.get(cache_key)
if cached is not None:
credential, ts = cached
if time.monotonic() - ts < _BYOK_CRED_CACHE_TTL:
_byok_cred_cache.move_to_end(cache_key) # promote to MRU
return credential
result = get_cached_byok_credential(user_id, mcp_server.server_id)
if result is not None:
cached_credential, _ = result
return cached_credential
from litellm.proxy.proxy_server import prisma_client
@ -1671,29 +1668,26 @@ if MCP_AVAILABLE:
)
# Check shared credential cache before hitting the DB.
cache_key = (user_id, mcp_server.server_id)
cached = _byok_cred_cache.get(cache_key)
if cached is not None:
cached_cred, ts = cached
if time.monotonic() - ts < _BYOK_CRED_CACHE_TTL:
_byok_cred_cache.move_to_end(cache_key) # promote to MRU
if cached_cred is None:
raise HTTPException(
status_code=401,
detail={
"error": "byok_auth_required",
"server_id": mcp_server.server_id,
"server_name": mcp_server.server_name or mcp_server.name,
"message": (
"No stored credential found for this BYOK server. "
"Complete the OAuth authorization flow to provide your API key."
),
},
headers={
"WWW-Authenticate": 'Bearer resource_metadata="/.well-known/oauth-protected-resource"'
},
)
return
cache_result = get_cached_byok_credential(user_id, mcp_server.server_id)
if cache_result is not None:
cached_cred, _ = cache_result
if cached_cred is None:
raise HTTPException(
status_code=401,
detail={
"error": "byok_auth_required",
"server_id": mcp_server.server_id,
"server_name": mcp_server.server_name or mcp_server.name,
"message": (
"No stored credential found for this BYOK server. "
"Complete the OAuth authorization flow to provide your API key."
),
},
headers={
"WWW-Authenticate": 'Bearer resource_metadata="/.well-known/oauth-protected-resource"'
},
)
return
from litellm.proxy.proxy_server import prisma_client

12
ui/litellm-dashboard/src/components/mcp_tools/mcp_server_columns.tsx
View file

@ -206,7 +206,17 @@ export const mcpServerColumns = (
return <span className="text-gray-300 text-xs">—</span>;
}
if (server.is_byok && server.auth_type === AUTH_TYPE.OAUTH2) {
if (!accessToken || !refreshServers) return null;
if (!accessToken || !refreshServers) {
return (
<button
disabled
className="text-xs px-2 py-1 rounded bg-gray-100 text-gray-400 cursor-not-allowed"
title="Sign in to connect"
>
Connect
</button>
);
}
return (
<OAuth2ConnectButton
server={server}