From a3811e1b20698907aa0b21881c7e5f5e2696ac28 Mon Sep 17 00:00:00 2001
From: Stefan Guilhen <sguilhen@redhat.com>
Date: Mon, 27 Apr 2026 08:41:10 -0300
Subject: [PATCH] Add id and description when building ResourceType
 representation

Closes #48464

Signed-off-by: Stefan Guilhen <sguilhen@redhat.com>
---
 .../scim/resource/spi/ScimResourceTypeProvider.java      | 9 +++++++++
 .../scim/model/resourcetype/ResourceTypeProvider.java    | 2 ++
 .../scim/model/user/UserResourceTypeProvider.java        | 5 +++++
 .../org/keycloak/tests/scim/tck/ResourceTypeTest.java    | 9 ++++++---
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/scim/core/src/main/java/org/keycloak/scim/resource/spi/ScimResourceTypeProvider.java b/scim/core/src/main/java/org/keycloak/scim/resource/spi/ScimResourceTypeProvider.java
index 1948678b96cd..e1ecd5d936bc 100644
--- a/scim/core/src/main/java/org/keycloak/scim/resource/spi/ScimResourceTypeProvider.java
+++ b/scim/core/src/main/java/org/keycloak/scim/resource/spi/ScimResourceTypeProvider.java
@@ -36,6 +36,15 @@ default String getName() {
         return getResourceType().getSimpleName();
     }
 
+    /**
+     * Returns a human-readable description of the resource type managed by this provider.
+     *
+     * @return the description of the resource type
+     */
+    default String getDescription() {
+        return getName();
+    }
+
     /**
      * Returns the schema name of the resource type managed by this provider.
      *
diff --git a/scim/model/src/main/java/org/keycloak/scim/model/resourcetype/ResourceTypeProvider.java b/scim/model/src/main/java/org/keycloak/scim/model/resourcetype/ResourceTypeProvider.java
index 8bdc7f36fd14..fe83a0b9e864 100644
--- a/scim/model/src/main/java/org/keycloak/scim/model/resourcetype/ResourceTypeProvider.java
+++ b/scim/model/src/main/java/org/keycloak/scim/model/resourcetype/ResourceTypeProvider.java
@@ -84,7 +84,9 @@ private ResourceType toRepresentation(ScimResourceTypeProviderFactory<? extends
             throw new RuntimeException("Could not instantiate resource type representation for provider " + factory.getId(), e);
         }
 
+        representation.setId(provider.getName());
         representation.setName(provider.getName());
+        representation.setDescription(provider.getDescription());
         representation.setEndpoint("/" + factory.getId());
         representation.setSchema(provider.getSchema());
 
diff --git a/scim/model/src/main/java/org/keycloak/scim/model/user/UserResourceTypeProvider.java b/scim/model/src/main/java/org/keycloak/scim/model/user/UserResourceTypeProvider.java
index 91f9cc894d5c..249d07dd775f 100644
--- a/scim/model/src/main/java/org/keycloak/scim/model/user/UserResourceTypeProvider.java
+++ b/scim/model/src/main/java/org/keycloak/scim/model/user/UserResourceTypeProvider.java
@@ -52,6 +52,11 @@ public UserResourceTypeProvider(KeycloakSession session) {
         super(session, new UserCoreModelSchema(session), List.of(new UserEnterpriseModelSchema(session)));
     }
 
+    @Override
+    public String getDescription() {
+        return "User Account";
+    }
+
     @Override
     public User onCreate(User resource) {
         UserProfileProvider provider = session.getProvider(UserProfileProvider.class);
diff --git a/scim/tests/base/src/test/java/org/keycloak/tests/scim/tck/ResourceTypeTest.java b/scim/tests/base/src/test/java/org/keycloak/tests/scim/tck/ResourceTypeTest.java
index afb5d1e477df..7e29313ee86d 100644
--- a/scim/tests/base/src/test/java/org/keycloak/tests/scim/tck/ResourceTypeTest.java
+++ b/scim/tests/base/src/test/java/org/keycloak/tests/scim/tck/ResourceTypeTest.java
@@ -29,14 +29,17 @@ public void testGet() {
         assertNotNull(response);
         assertEquals(2, response.getResources().size());
 
-        assertResourceType(response, User.class, List.of(ENTERPRISE_USER_SCHEMA));
-        assertResourceType(response, Group.class, List.of());
+        assertResourceType(response, User.class, "User Account", List.of(ENTERPRISE_USER_SCHEMA));
+        assertResourceType(response, Group.class, "Group", List.of());
     }
 
-    private static void assertResourceType(ListResponse<ResourceType> response, Class<? extends ResourceTypeRepresentation> resourceType, List<String> expectedSchemaExtensions) {
+    private static void assertResourceType(ListResponse<ResourceType> response, Class<? extends ResourceTypeRepresentation> resourceType,
+            String expectedDescription, List<String> expectedSchemaExtensions) {
         ResourceType representation = response.getResources().stream().filter(r -> r.getName().equals(resourceType.getSimpleName())).findAny().orElse(null);
 
         assertNotNull(representation);
+        assertEquals(resourceType.getSimpleName(), representation.getId());
+        assertEquals(expectedDescription, representation.getDescription());
         assertEquals("/" + representation.getName() + "s", representation.getEndpoint());
         assertEquals(getCoreSchema(resourceType), representation.getSchema());