Skip to content

Commit 74da22b

Browse files
authored
[JAVA-29167] Upgrade spring-boot-keycloak to Spring Boot 3 (#15972)
1 parent d6db20d commit 74da22b

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/SecurityConfig.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public SecurityFilterChain resourceServerFilterChain(HttpSecurity http) throws E
6262
.permitAll()
6363
.anyRequest()
6464
.authenticated());
65-
http.oauth2ResourceServer((oauth2) -> oauth2
65+
http.oauth2ResourceServer(oauth2 -> oauth2
6666
.jwt(Customizer.withDefaults()));
6767
http.oauth2Login(Customizer.withDefaults())
6868
.logout(logout -> logout.addLogoutHandler(keycloakLogoutHandler).logoutSuccessUrl("/"));
@@ -88,17 +88,15 @@ public GrantedAuthoritiesMapper userAuthoritiesMapperForKeycloak() {
8888
var roles = (Collection<String>) realmAccess.get(ROLES_CLAIM);
8989
mappedAuthorities.addAll(generateAuthoritiesFromClaim(roles));
9090
} else if (userInfo.hasClaim(GROUPS)) {
91-
Collection<String> roles = (Collection<String>) userInfo.getClaim(
92-
GROUPS);
91+
Collection<String> roles = userInfo.getClaim(GROUPS);
9392
mappedAuthorities.addAll(generateAuthoritiesFromClaim(roles));
9493
}
9594
} else {
9695
var oauth2UserAuthority = (OAuth2UserAuthority) authority;
9796
Map<String, Object> userAttributes = oauth2UserAuthority.getAttributes();
9897

9998
if (userAttributes.containsKey(REALM_ACCESS_CLAIM)) {
100-
Map<String, Object> realmAccess = (Map<String, Object>) userAttributes.get(
101-
REALM_ACCESS_CLAIM);
99+
Map<String, Object> realmAccess = (Map<String, Object>) userAttributes.get(REALM_ACCESS_CLAIM);
102100
Collection<String> roles = (Collection<String>) realmAccess.get(ROLES_CLAIM);
103101
mappedAuthorities.addAll(generateAuthoritiesFromClaim(roles));
104102
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.springframework.context.annotation.Bean;
55
import org.springframework.context.annotation.Configuration;
66
import org.springframework.security.config.Customizer;
7-
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
7+
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
88
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
99
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
1010
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -13,15 +13,15 @@
1313
@Configuration
1414
@EnableWebSecurity
1515
@ConditionalOnProperty(name = "keycloak.enabled", havingValue = "true")
16-
@EnableGlobalMethodSecurity(jsr250Enabled = true)
16+
@EnableMethodSecurity(jsr250Enabled = true)
1717
public class KeycloakSecurityConfig {
1818

1919
@Bean
2020
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
2121
http.csrf(AbstractHttpConfigurer::disable)
2222
.authorizeHttpRequests(auth -> auth.anyRequest()
2323
.authenticated())
24-
.oauth2ResourceServer((oauth2) -> oauth2
24+
.oauth2ResourceServer(oauth2 -> oauth2
2525
.jwt(Customizer.withDefaults()));
2626
return http.build();
2727
}

0 commit comments

Comments
 (0)