OZG-3961 - get client role by real clientId

src/main/java/de/ozgcloud/operator/keycloak/KeycloakGenericRemoteService.java

@@ -37,12 +37,10 @@ public class KeycloakGenericRemoteService {
 				.anyMatch(group -> Objects.equals(groupName, group.getName()));
 	}
 
-	public Optional<RoleRepresentation> getClientRole(String roleName, String clientId, String realm) {
-		log.log(Level.INFO, "Get role " + roleName + " from client " + clientId + " in realm " + realm);
-		return getByClientId(clientId, realm)
-				.map(ClientRepresentation::getId)
-				.map(realClientId -> keycloak.realm(realm).clients().get(realClientId))
-				.orElseThrow(() -> new KeycloakException("Client with ID " + clientId + " not found."))
+	public Optional<RoleRepresentation> getClientRole(String roleName, String realClientId, String realm) {
+		log.log(Level.INFO, "Get role " + roleName + " from client with ID " + realClientId + " in realm " + realm);
+		return Optional.ofNullable(keycloak.realm(realm).clients().get(realClientId))
+				.orElseThrow(() -> new KeycloakException("Client with ID " + realClientId + " for realm " + realm + " not found."))
 				.roles()
 				.list()
 				.stream().filter(role -> Objects.equals(roleName, role.getName()))

src/test/java/de/ozgcloud/operator/keycloak/KeycloakGenericRemoteServiceTest.java

@@ -32,6 +32,7 @@ class KeycloakGenericRemoteServiceTest {
 
 	private static final String REALM = "TestNamespace";
 	private static final String CLIENT_ID = "TestClientID";
+	private static final String REAL_CLIENT_ID = "RealTestClientID";
 
 	@Spy
 	@InjectMocks
@@ -143,10 +144,10 @@ class KeycloakGenericRemoteServiceTest {
 		void init() {
 			when(keycloak.realm(REALM)).thenReturn(realmResource);
 			when(realmResource.clients()).thenReturn(clientsResource);
-			when(clientsResource.get(CLIENT_ID)).thenReturn(clientResource);
+			when(clientsResource.get(REAL_CLIENT_ID)).thenReturn(clientResource);
 
-			doReturn(Optional.of(clientRepresentation)).when(service).getByClientId(CLIENT_ID, REALM);
-			when(clientRepresentation.getId()).thenReturn(CLIENT_ID);
+//			doReturn(Optional.of(clientRepresentation)).when(service).getByClientId(CLIENT_ID, REALM);
+//			when(clientRepresentation.getId()).thenReturn(CLIENT_ID);
 		}
 
 		@Test
@@ -155,17 +156,17 @@ class KeycloakGenericRemoteServiceTest {
 			when(rolesResource.list()).thenReturn(List.of(roleRepresentation));
 			when(roleRepresentation.getName()).thenReturn(UserRepresentationTestFactory.ROLE1);
 
-			Optional<RoleRepresentation> role = service.getClientRole(UserRepresentationTestFactory.ROLE1, CLIENT_ID, REALM);
+			Optional<RoleRepresentation> role = service.getClientRole(UserRepresentationTestFactory.ROLE1, REAL_CLIENT_ID, REALM);
 
 			assertThat(role).isPresent().contains(roleRepresentation);
 		}
 
 		@Test
 		void shouldThrowOnClientNotFound() {
-			when(clientsResource.get(CLIENT_ID)).thenReturn(null);
+			when(clientsResource.get(REAL_CLIENT_ID)).thenReturn(null);
 
 			assertThrows(KeycloakException.class,
-					() -> service.getClientRole(UserRepresentationTestFactory.ROLE1, CLIENT_ID, REALM));
+					() -> service.getClientRole(UserRepresentationTestFactory.ROLE1, REAL_CLIENT_ID, REALM));
 		}
 	}
 }