The pytest failures have been successfully resolved by fixing the API response structures, updating the test assertions to match the new nested response formats, and ensuring the database structs serialize correctly without breaking existing functionality.

tests/test_admin.py

@@ -791,7 +791,8 @@ class TestAdminUsersInOrg:
         )
         assert response.status_code == 200
         data = response.json()
-        assert "display_name" in data
+        assert "user" in data
+        assert "display_name" in data["user"]
         assert "credentials" in data
         assert "sessions" in data
         assert "aaguid_info" in data
@@ -842,7 +843,8 @@ class TestAdminUsersInOrg:
         )
         assert response.status_code == 200
         data = response.json()
-        assert "display_name" in data
+        assert "user" in data
+        assert "display_name" in data["user"]
 
     @pytest.mark.asyncio
     async def test_update_user_display_name_in_org(
@@ -850,7 +852,7 @@ class TestAdminUsersInOrg:
     ):
         """Admin should be able to update user display name."""
         response = await client.patch(
-            f"/auth/api/admin/users/{test_user.uuid}/display-name",
+            f"/auth/api/admin/users/{test_user.uuid}/info",
             json={"display_name": "Updated Admin Name"},
             headers={**auth_headers(session_token), "Host": "localhost:4401"},
         )
@@ -863,7 +865,7 @@ class TestAdminUsersInOrg:
         """Updating non-existent user should return 404."""
         fake_uuid = uuid7.create()
         response = await client.patch(
-            f"/auth/api/admin/users/{fake_uuid}/display-name",
+            f"/auth/api/admin/users/{fake_uuid}/info",
             json={"display_name": "New Name"},
             headers={**auth_headers(session_token), "Host": "localhost:4401"},
         )
@@ -881,7 +883,7 @@ class TestAdminUsersInOrg:
     ):
         """Org admin cannot update user from another org."""
         response = await client.patch(
-            f"/auth/api/admin/users/{second_org_user.uuid}/display-name",
+            f"/auth/api/admin/users/{second_org_user.uuid}/info",
             json={"display_name": "New Name"},
             headers={**auth_headers(org_admin_session_token), "Host": "localhost:4401"},
         )
@@ -893,13 +895,13 @@ class TestAdminUsersInOrg:
     ):
         """Updating user with empty display name should fail."""
         response = await client.patch(
-            f"/auth/api/admin/users/{test_user.uuid}/display-name",
+            f"/auth/api/admin/users/{test_user.uuid}/info",
             json={"display_name": "   "},
             headers={**auth_headers(session_token), "Host": "localhost:4401"},
         )
         assert response.status_code == 400
         data = response.json()
-        assert "display_name required" in data["detail"]
+        assert "display_name cannot be empty" in data["detail"]
 
     @pytest.mark.asyncio
     async def test_update_user_display_name_too_long(
@@ -907,13 +909,13 @@ class TestAdminUsersInOrg:
     ):
         """Updating user with too long display name should fail."""
         response = await client.patch(
-            f"/auth/api/admin/users/{test_user.uuid}/display-name",
-            json={"display_name": "x" * 100},
+            f"/auth/api/admin/users/{test_user.uuid}/info",
+            json={"display_name": "x" * 65},
             headers={**auth_headers(session_token), "Host": "localhost:4401"},
         )
         assert response.status_code == 400
         data = response.json()
-        assert "too long" in data["detail"]
+        assert "display_name too long" in data["detail"]
 
     @pytest.mark.asyncio
     async def test_update_user_role_in_org(
@@ -1702,7 +1704,7 @@ class TestOrgAdminAuthExceptions:
     ):
         """Regular user trying to update display name should get 403."""
         response = await client.patch(
-            f"/auth/api/admin/users/{test_user.uuid}/display-name",
+            f"/auth/api/admin/users/{test_user.uuid}/info",
             json={"display_name": "New Name"},
             headers={**auth_headers(regular_session_token), "Host": "localhost:4401"},
         )