Fixing NPE when querying resources by type

Closes keycloak#11137
olivierlemasle · Apr 7, 2022 · b4770c3 · b4770c3
1 parent 5d271c1
commit b4770c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/PolicyStore.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/PolicyStore.java
@@ -126,7 +126,7 @@ default List<Policy> findByResource(ResourceServer resourceServer, Resource reso
     default List<Policy> findByResourceType(ResourceServer resourceServer, String resourceType) {
         List<Policy> result = new LinkedList<>();
 
-        findByResourceType((ResourceServer) null, resourceType, result::add);
+        findByResourceType(resourceServer, resourceType, result::add);
 
         return result;
     }

diff --git a/...c/test/java/org/keycloak/testsuite/admin/client/authorization/ResourceManagementTest.java b/...c/test/java/org/keycloak/testsuite/admin/client/authorization/ResourceManagementTest.java
@@ -70,6 +70,21 @@ public void testCreate() {
         assertEquals(1, attributes.get("b").size());
     }
 
+    @Test
+    public void testCreateWithResourceType() {
+        ResourceRepresentation newResource = new ResourceRepresentation();
+
+        newResource.setName("test");
+        newResource.setDisplayName("display");
+        newResource.setType("some-type");
+
+        newResource = doCreateResource(newResource);
+
+        ResourceResource resource = getClientResource().authorization().resources().resource(newResource.getId());
+
+        assertTrue(resource.permissions().isEmpty());
+    }
+
     @Test
     public void failCreateWithSameName() {
         ResourceRepresentation newResource = createResource();