fix(sso): preserve identity provider user IDs

This commit is contained in:
Mrinal Chanshetty 2026-11-05 16:10:59 -08:00
parent c80cce69b4
commit b2656a2e13
3 changed files with 19 additions and 11 deletions

View file

@ -78,7 +78,6 @@ from litellm.proxy._types import (
LitellmUserRoles,
Member,
NewTeamRequest,
NewUserRequest,
NewUserRequestTeam,
NewUserResponse,
ProxyErrorTypes,
@ -164,6 +163,7 @@ from litellm.types.proxy.management_endpoints.ui_sso import (
MicrosoftGraphAPIUserGroupResponse,
MicrosoftServicePrincipalTeam,
RoleMappings,
SSONewUserRequest,
TeamMappings,
)
from litellm.types.proxy.ui_sso import ParsedOpenIDResult
@ -2915,7 +2915,7 @@ async def insert_sso_user(
if user_defined_values["user_role"] is None:
user_defined_values["user_role"] = LitellmUserRoles.INTERNAL_USER_VIEW_ONLY
new_user_request: Final = NewUserRequest(
new_user_request: Final = SSONewUserRequest(
user_id=user_defined_values["user_id"],
user_email=normalize_email(user_defined_values["user_email"]),
user_alias=_get_sso_user_alias(result_openid),
@ -2924,11 +2924,9 @@ async def insert_sso_user(
budget_duration=user_defined_values["budget_duration"],
sso_user_id=user_defined_values["user_id"],
auto_create_key=False,
metadata={"auth_provider": getattr(result_openid, "provider")} if hasattr(result_openid, "provider") else {},
)
if result_openid and hasattr(result_openid, "provider"):
new_user_request.metadata = {"auth_provider": getattr(result_openid, "provider")}
from litellm.proxy.proxy_server import premium_user
with free_sso_user_creation(new_user_request.user_id, enabled=premium_user is not True):

View file

@ -1,12 +1,19 @@
from typing import Literal
from pydantic import Field
from pydantic import ConfigDict, Field
from typing_extensions import TypedDict
from litellm.types.proxy.auth.user_roles import KeyManagementRoutes, LitellmUserRoles
from litellm.types.proxy.management_endpoints.user_requests import NewUserRequest
from litellm.types.utils import LiteLLMPydanticObjectBase
class SSONewUserRequest(NewUserRequest):
model_config = ConfigDict(frozen=True)
user_id: str | None = None
class LiteLLM_UpperboundKeyGenerateParams(LiteLLMPydanticObjectBase):
"""
Set default upperbound to max budget a key called via `/key/generate` can be.

View file

@ -1338,7 +1338,8 @@ async def test_upsert_sso_user_fills_user_alias_for_existing_user():
@pytest.mark.asyncio
async def test_insert_sso_user_sets_user_alias_from_display_name():
@pytest.mark.parametrize("user_id", ["S-1-5-21-adfs-user", " employee-42 "])
async def test_insert_sso_user_sets_user_alias_from_display_name(user_id: str):
"""
A newly created SSO user is inserted with the IdP display name as user_alias.
"""
@ -1347,7 +1348,7 @@ async def test_insert_sso_user_sets_user_alias_from_display_name():
from litellm.proxy.management_endpoints.ui_sso import insert_sso_user
sso_result = CustomOpenID(
id="S-1-5-21-adfs-user",
id=user_id,
email="jane.doe@example.com",
first_name="Jane",
last_name="Doe",
@ -1357,7 +1358,7 @@ async def test_insert_sso_user_sets_user_alias_from_display_name():
)
user_defined_values: SSOUserDefinedValues = {
"models": [],
"user_id": "S-1-5-21-adfs-user",
"user_id": user_id,
"user_email": "jane.doe@example.com",
"max_budget": None,
"user_role": "internal_user",
@ -1366,12 +1367,14 @@ async def test_insert_sso_user_sets_user_alias_from_display_name():
with patch(
"litellm.proxy.management_endpoints.ui_sso.new_user",
return_value=NewUserResponse(user_id="S-1-5-21-adfs-user", key="sk-xxxxx", teams=None),
return_value=NewUserResponse(user_id=user_id, key="sk-xxxxx", teams=None),
) as mock_new_user:
await insert_sso_user(result_openid=sso_result, user_defined_values=user_defined_values)
new_user_request = mock_new_user.call_args.kwargs["data"]
assert new_user_request.user_id == "S-1-5-21-adfs-user"
assert new_user_request.user_id == user_id
assert new_user_request.sso_user_id == user_id
assert new_user_request.metadata == {"auth_provider": "generic"}
assert new_user_request.user_email == "jane.doe@example.com"
assert new_user_request.user_alias == "Doe, Jane"