diff --git a/spring-security-modules/spring-security-oidc/pom.xml b/spring-security-modules/spring-security-oidc/pom.xml index c27c084ad7..5d8e07e500 100644 --- a/spring-security-modules/spring-security-oidc/pom.xml +++ b/spring-security-modules/spring-security-oidc/pom.xml @@ -10,7 +10,8 @@ com.baeldung - spring-security-modules + parent-boot-3 + ../../parent-boot-3 0.0.1-SNAPSHOT @@ -29,4 +30,8 @@ + + com.baeldung.openid.oidc.sessionmanagement.SpringOidcSessionManagementApplication + + \ No newline at end of file diff --git a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java index 895fe676e1..e325df4666 100644 --- a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java +++ b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java @@ -16,5 +16,4 @@ public class SpringOidcDiscoveryApplication { application.addInitializers(yamlInitializer); application.run(args); } - } diff --git a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/MappingJwtGrantedAuthoritiesConverter.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/MappingJwtGrantedAuthoritiesConverter.java index 0b47082294..20f0d70451 100644 --- a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/MappingJwtGrantedAuthoritiesConverter.java +++ b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/MappingJwtGrantedAuthoritiesConverter.java @@ -54,10 +54,10 @@ public class MappingJwtGrantedAuthoritiesConverter implements Converter jwt.hasClaim(claim)) + .filter(jwt::hasClaim) .findFirst() .orElse(null); - + if ( scopeClaim == null ) { return Collections.emptyList(); } @@ -76,7 +76,7 @@ public class MappingJwtGrantedAuthoritiesConverter implements Converter)v).stream() - .map( s -> s.toString()) + .map(Object::toString) .collect(Collectors.toCollection(HashSet::new)); } return Collections.emptyList(); diff --git a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/SecurityConfig.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/SecurityConfig.java index 7495831b54..c90836780d 100644 --- a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/SecurityConfig.java +++ b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/jwtauthorities/config/SecurityConfig.java @@ -64,12 +64,10 @@ public class SecurityConfig { @Bean SecurityFilterChain customJwtSecurityChain(HttpSecurity http) throws Exception { // @formatter:off - return http.oauth2ResourceServer(oauth2 -> { - oauth2.jwt() - .jwtAuthenticationConverter(customJwtAuthenticationConverter(accountService)); - }) - .build(); + return http.oauth2ResourceServer(oauth2 -> oauth2 + .jwt(jwtConfigurer -> jwtConfigurer + .jwtAuthenticationConverter(customJwtAuthenticationConverter(accountService)))) + .build(); // @formatter:on } - } diff --git a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java index 6f39ed8283..7423a03478 100644 --- a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java +++ b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java @@ -21,10 +21,9 @@ public class OAuth2LoginSecurityConfig { OidcUserService googleUserService = new OidcUserService(); googleUserService.setAccessibleScopes(googleScopes); - http.authorizeRequests(authorizeRequests -> authorizeRequests.anyRequest() - .authenticated()) - .oauth2Login(oauthLogin -> oauthLogin.userInfoEndpoint() - .oidcUserService(googleUserService)); + http.authorizeHttpRequests(authorizeRequests -> authorizeRequests.anyRequest().authenticated()) + .oauth2Login(oauthLogin -> oauthLogin.userInfoEndpoint(userInfoEndpointConfig -> + userInfoEndpointConfig.oidcUserService(googleUserService))); return http.build(); } } \ No newline at end of file diff --git a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java index 9d3b27296e..8c5a4a80f5 100644 --- a/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java +++ b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java @@ -1,11 +1,10 @@ package com.baeldung.openid.oidc.sessionmanagement.config; -import java.net.URI; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractAuthenticationFilterConfigurer; import org.springframework.security.oauth2.client.oidc.web.logout.OidcClientInitiatedLogoutSuccessHandler; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.web.SecurityFilterChain; @@ -19,19 +18,18 @@ public class OAuth2SessionManagementSecurityConfig { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - http.authorizeRequests(authorizeRequests -> authorizeRequests.mvcMatchers("/home") - .permitAll() - .anyRequest() - .authenticated()) - .oauth2Login(oauthLogin -> oauthLogin.permitAll()) - .logout(logout -> logout.logoutSuccessHandler(oidcLogoutSuccessHandler())); + http.authorizeHttpRequests(authorizeRequests -> authorizeRequests + .requestMatchers("/home").permitAll() + .anyRequest().authenticated()) + .oauth2Login(AbstractAuthenticationFilterConfigurer::permitAll) + .logout(logout -> logout.logoutSuccessHandler(oidcLogoutSuccessHandler())); return http.build(); } private LogoutSuccessHandler oidcLogoutSuccessHandler() { OidcClientInitiatedLogoutSuccessHandler oidcLogoutSuccessHandler = new OidcClientInitiatedLogoutSuccessHandler(this.clientRegistrationRepository); - oidcLogoutSuccessHandler.setPostLogoutRedirectUri(URI.create("http://localhost:8081/home")); + oidcLogoutSuccessHandler.setPostLogoutRedirectUri("http://localhost:8081/home"); return oidcLogoutSuccessHandler; }