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 5bb5cef58c..6f39ed8283 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 @@ -3,16 +3,17 @@ package com.baeldung.openid.oidc.login.config; import java.util.HashSet; import java.util.Set; +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.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService; +import org.springframework.security.web.SecurityFilterChain; @Configuration -public class OAuth2LoginSecurityConfig extends WebSecurityConfigurerAdapter {// @formatter:off +public class OAuth2LoginSecurityConfig { - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { Set googleScopes = new HashSet<>(); googleScopes.add("https://www.googleapis.com/auth/userinfo.email"); googleScopes.add("https://www.googleapis.com/auth/userinfo.profile"); @@ -21,8 +22,9 @@ public class OAuth2LoginSecurityConfig extends WebSecurityConfigurerAdapter {// googleUserService.setAccessibleScopes(googleScopes); http.authorizeRequests(authorizeRequests -> authorizeRequests.anyRequest() - .authenticated()) + .authenticated()) .oauth2Login(oauthLogin -> oauthLogin.userInfoEndpoint() - .oidcUserService(googleUserService)); - }// @formatter:on + .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 5a55c89b05..9d3b27296e 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 @@ -3,29 +3,30 @@ 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.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.oauth2.client.oidc.web.logout.OidcClientInitiatedLogoutSuccessHandler; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; @Configuration -public class OAuth2SessionManagementSecurityConfig extends WebSecurityConfigurerAdapter { +public class OAuth2SessionManagementSecurityConfig { @Autowired private ClientRegistrationRepository clientRegistrationRepository; - @Override - protected void configure(HttpSecurity http) throws Exception { // @formatter:off + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http.authorizeRequests(authorizeRequests -> authorizeRequests.mvcMatchers("/home") - .permitAll() - .anyRequest() - .authenticated()) + .permitAll() + .anyRequest() + .authenticated()) .oauth2Login(oauthLogin -> oauthLogin.permitAll()) .logout(logout -> logout.logoutSuccessHandler(oidcLogoutSuccessHandler())); - } // @formatter:on - + return http.build(); + } private LogoutSuccessHandler oidcLogoutSuccessHandler() { OidcClientInitiatedLogoutSuccessHandler oidcLogoutSuccessHandler = new OidcClientInitiatedLogoutSuccessHandler(this.clientRegistrationRepository);