From bf97d994b5ce48abb3d59a8912a79d78e162f44b Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Tue, 20 May 2025 22:58:41 -0700
Subject: [PATCH] fix: default role for JWT authentication   (#10995)

* fix: get_user_object

* test: test_default_internal_user_params_with_get_user_object

* Update litellm/proxy/auth/auth_checks.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 litellm/proxy/auth/auth_checks.py            |  8 ++-
 tests/litellm/proxy/auth/test_auth_checks.py | 70 +++++++++++++++++++-
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/litellm/proxy/auth/auth_checks.py b/litellm/proxy/auth/auth_checks.py
index e18b358fa6..48e9787d00 100644
--- a/litellm/proxy/auth/auth_checks.py
+++ b/litellm/proxy/auth/auth_checks.py
@@ -697,8 +697,14 @@ async def get_user_object(
 
         if response is None:
             if user_id_upsert:
+                new_user_params: Dict[str, Any] = {
+                    "user_id": user_id,
+                }
+                if litellm.default_internal_user_params is not None:
+                    new_user_params.update(litellm.default_internal_user_params)
+
                 response = await prisma_client.db.litellm_usertable.create(
-                    data={"user_id": user_id},
+                    data=new_user_params,
                     include={"organization_memberships": True},
                 )
             else:
diff --git a/tests/litellm/proxy/auth/test_auth_checks.py b/tests/litellm/proxy/auth/test_auth_checks.py
index 24e8506e97..97c952b63f 100644
--- a/tests/litellm/proxy/auth/test_auth_checks.py
+++ b/tests/litellm/proxy/auth/test_auth_checks.py
@@ -18,7 +18,7 @@ from litellm.proxy._types import (
     LitellmUserRoles,
     SSOUserDefinedValues,
 )
-from litellm.proxy.auth.auth_checks import ExperimentalUIJWTToken
+from litellm.proxy.auth.auth_checks import ExperimentalUIJWTToken, get_user_object
 from litellm.proxy.common_utils.encrypt_decrypt_utils import decrypt_value_helper
 from litellm.utils import get_utc_datetime
 
@@ -59,6 +59,8 @@ def test_get_experimental_ui_login_jwt_auth_token_valid(valid_sso_user_defined_v
 
     # Decrypt and verify token contents
     decrypted_token = decrypt_value_helper(token, exception_type="debug")
+    # Check that decrypted_token is not None before using json.loads
+    assert decrypted_token is not None
     token_data = json.loads(decrypted_token)
 
     assert token_data["user_id"] == "test_user"
@@ -110,3 +112,69 @@ def test_get_key_object_from_ui_hash_key_invalid():
     # Test with invalid token
     key_object = ExperimentalUIJWTToken.get_key_object_from_ui_hash_key("invalid_token")
     assert key_object is None
+
+
+@pytest.mark.asyncio
+async def test_default_internal_user_params_with_get_user_object(monkeypatch):
+    """Test that default_internal_user_params is used when creating a new user via get_user_object"""
+    # Set up default_internal_user_params
+    default_params = {
+        "models": ["gpt-4", "claude-3-opus"],
+        "max_budget": 200.0,
+        "user_role": "internal_user",
+    }
+    monkeypatch.setattr(litellm, "default_internal_user_params", default_params)
+
+    # Mock the necessary dependencies
+    mock_prisma_client = MagicMock()
+    mock_db = AsyncMock()
+    mock_prisma_client.db = mock_db
+
+    # Set up the user creation mock - create a complete user model that can be converted to a dict
+    mock_user = MagicMock()
+    mock_user.user_id = "new_test_user"
+    mock_user.models = ["gpt-4", "claude-3-opus"]
+    mock_user.max_budget = 200.0
+    mock_user.user_role = "internal_user"
+    mock_user.organization_memberships = []
+
+    # Make the mock model_dump or dict method return appropriate data
+    mock_user.dict = lambda: {
+        "user_id": "new_test_user",
+        "models": ["gpt-4", "claude-3-opus"],
+        "max_budget": 200.0,
+        "user_role": "internal_user",
+        "organization_memberships": [],
+    }
+
+    # Setup the mock returns
+    mock_prisma_client.db.litellm_usertable.find_unique = AsyncMock(return_value=None)
+    mock_prisma_client.db.litellm_usertable.create = AsyncMock(return_value=mock_user)
+
+    # Create a mock cache - use AsyncMock for async methods
+    mock_cache = MagicMock()
+    mock_cache.async_get_cache = AsyncMock(return_value=None)
+    mock_cache.async_set_cache = AsyncMock()
+
+    # Call get_user_object with user_id_upsert=True to trigger user creation
+    try:
+        user_obj = await get_user_object(
+            user_id="new_test_user",
+            prisma_client=mock_prisma_client,
+            user_api_key_cache=mock_cache,
+            user_id_upsert=True,
+            proxy_logging_obj=None,
+        )
+    except Exception as e:
+        # this fails since the mock object is a MagicMock and not a LiteLLM_UserTable
+        print(e)
+
+    # Verify the user was created with the default params
+    mock_prisma_client.db.litellm_usertable.create.assert_called_once()
+    creation_args = mock_prisma_client.db.litellm_usertable.create.call_args[1]["data"]
+
+    # Verify defaults were applied to the creation args
+    assert "models" in creation_args
+    assert creation_args["models"] == ["gpt-4", "claude-3-opus"]
+    assert creation_args["max_budget"] == 200.0
+    assert creation_args["user_role"] == "internal_user"