JAVA-46416 - test fixes

Author: ulisseslima

spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/keycloaksoap/KeycloakRoleConverter.java

@@ -1,20 +1,27 @@
 package com.baeldung.keycloak.keycloaksoap;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.oauth2.jwt.Jwt;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 public class KeycloakRoleConverter implements Converter<Jwt, Collection<GrantedAuthority>> {
 
+    private final String clientId;
+
+    public KeycloakRoleConverter(String clientId) {
+        this.clientId = clientId;
+    }
+
     @Override
+    @SuppressWarnings("unchecked")
     public Collection<GrantedAuthority> convert(Jwt jwt) {
         Map<String, Object> resourceAccess = jwt.getClaim("resource_access");
-        // Replace this with your actual client ID from Keycloak
-        String clientId = "baeldung-soap-services";
 
         Map<String, Object> client = (Map<String, Object>) resourceAccess.get(clientId);
         List<String> roles = (List<String>) client.get("roles");

spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/keycloaksoap/KeycloakSecurityConfig.java

@@ -1,5 +1,6 @@
 package com.baeldung.keycloak.keycloaksoap;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,6 +16,10 @@
 @ConditionalOnProperty(name = "keycloak.enabled", havingValue = "true")
 @EnableMethodSecurity(jsr250Enabled = true)
 public class KeycloakSecurityConfig {
+
+    @Value("${client.id}")
+    private String clientId;
+
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http.csrf(AbstractHttpConfigurer::disable)
@@ -29,7 +34,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     @Bean
     public JwtAuthenticationConverter jwtAuthenticationConverter() {
         JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
-        converter.setJwtGrantedAuthoritiesConverter(new KeycloakRoleConverter());
+        converter.setJwtGrantedAuthoritiesConverter(new KeycloakRoleConverter(clientId));
         return converter;
     }
 }

spring-boot-modules/spring-boot-keycloak-2/src/test/java/com/baeldung/keycloaksoap/KeycloakSoapLiveTest.java

@@ -98,15 +98,15 @@ void givenWrongAccessToken_whenGetProducts_thenReturnError() {
     }
 
     /**
-     * Happy flow to test <i>deleteProduct</i> operation. Test the <i>jhondoe</i> user.
+     * Happy flow to test <i>deleteProduct</i> operation. Test the <i>johndoe</i> user.
      * This user should be configured in Keycloak server with a role <i>user</i>
      */
     @Test
     @DisplayName("Delete Product With Access Token")
     void givenAccessToken_whenDeleteProduct_thenReturnSuccess() {
         HttpHeaders headers = new HttpHeaders();
         headers.set("content-type", "text/xml");
-        headers.set("Authorization", "Bearer " + generateToken("jhondoe", "password"));
+        headers.set("Authorization", "Bearer " + generateToken("johndoe", "password"));
         HttpEntity<String> request = new HttpEntity<>(Utility.getDeleteProductsRequest(), headers);
         ResponseEntity<String> responseEntity = restTemplate.postForEntity("http://localhost:" + port + "/ws/api/v1/", request, String.class);
 
@@ -126,7 +126,7 @@ void givenAccessToken_whenDeleteProduct_thenReturnSuccess() {
     void givenUnauthorizedAccessToken_whenDeleteProduct_thenReturnUnauthorized() {
         HttpHeaders headers = new HttpHeaders();
         headers.set("content-type", "text/xml");
-        headers.set("Authorization", "Bearer " + generateToken("johndoe", "password"));
+        headers.set("Authorization", "Bearer " + generateToken("janedoe", "password"));
         HttpEntity<String> request = new HttpEntity<>(Utility.getDeleteProductsRequest(), headers);
         ResponseEntity<String> responseEntity = restTemplate.postForEntity("http://localhost:" + port + "/ws/api/v1/", request, String.class);