diff --git a/litellm/proxy/management_endpoints/types.py b/litellm/proxy/management_endpoints/types.py index d4fd7a31d13..691fe169078 100644 --- a/litellm/proxy/management_endpoints/types.py +++ b/litellm/proxy/management_endpoints/types.py @@ -92,6 +92,7 @@ def get_litellm_user_role(role_str: object) -> LitellmUserRoles | None: class CustomOpenID(OpenID): + email: str | None = None team_ids: list[str] team_id_to_upsert: str | None = None user_role: LitellmUserRoles | None = None diff --git a/tests/unit/proxy/management_endpoints/test_ui_sso.py b/tests/unit/proxy/management_endpoints/test_ui_sso.py index ba78fefd653..6cfc0f1705a 100644 --- a/tests/unit/proxy/management_endpoints/test_ui_sso.py +++ b/tests/unit/proxy/management_endpoints/test_ui_sso.py @@ -1187,6 +1187,40 @@ def test_generic_response_convertor_normalizes_email(): assert result.display_name == "Test User" +@pytest.mark.parametrize( + "email", + ["Dan@Corp.local", "dan@corp.test", "dan@corp.com"], +) +def test_generic_response_convertor_accepts_special_use_email_domains(email: str) -> None: + from litellm.proxy.management_endpoints.ui_sso import generic_response_convertor + + jwt_handler: Final = MagicMock(spec=JWTHandler) + jwt_handler.get_team_ids_from_jwt.return_value = [] + + result: Final = generic_response_convertor( + response={"email": email}, + jwt_handler=jwt_handler, + sso_jwt_handler=None, + role_mappings=None, + ) + + assert isinstance(result, CustomOpenID) + assert result.email == email.lower() + + +def test_microsoft_sso_handler_accepts_special_use_email_domain() -> None: + from litellm.proxy.management_endpoints.ui_sso import MICROSOFT_USER_EMAIL_ATTRIBUTE + + result: Final = MicrosoftSSOHandler.openid_from_response( + response={MICROSOFT_USER_EMAIL_ATTRIBUTE: "dan@corp.local"}, + team_ids=[], + user_role=None, + ) + + assert isinstance(result, CustomOpenID) + assert result.email == "dan@corp.local" + + @pytest.mark.asyncio async def test_upsert_sso_user_updates_role_for_existing_user(): """ @@ -1556,6 +1590,11 @@ def test_get_user_email_and_id_extracts_microsoft_role(): id="id", ), pytest.param(CustomOpenID(email="a@example.com", provider="generic", team_ids=[]), "a@example.com", id="email"), + pytest.param( + CustomOpenID(email="dan@corp.local", provider="generic", team_ids=[]), + "dan@corp.local", + id="special-use-email", + ), pytest.param( CustomOpenID(id=" ", email="a@example.com", provider="generic", team_ids=[]), "a@example.com",