Format code

Author: ReLive27

gateway-oauth2-login/auth-server/src/main/java/com/relive/config/AuthorizationServerConfig.java

@@ -13,7 +13,6 @@
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.authorization.OAuth2AuthorizationServerConfigurer;
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -59,9 +58,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
 
         return http.requestMatcher(endpointsMatcher)
                 .authorizeRequests((authorizeRequests) -> {
-                    ((ExpressionUrlAuthorizationConfigurer.AuthorizedUrl) authorizeRequests.anyRequest()).authenticated();
+                    authorizeRequests.anyRequest().authenticated();
                 }).csrf((csrf) -> {
-                    csrf.ignoringRequestMatchers(new RequestMatcher[]{endpointsMatcher});
+                    csrf.ignoringRequestMatchers(endpointsMatcher);
                 }).apply(authorizationServerConfigurer)
                 .and()
                 .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt)

gateway-oauth2-login/auth-server/src/main/java/com/relive/config/DefaultSecurityConfig.java

@@ -93,7 +93,7 @@ ClientRegistrationRepository clientRegistrationRepository(JdbcTemplate jdbcTempl
                 .clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
                 .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
                 .redirectUri("{baseUrl}/{action}/oauth2/code/{registrationId}")
-                .scope(new String[]{"read:user"})
+                .scope("read:user")
                 .authorizationUri("https://github.com/login/oauth/authorize")
                 .tokenUri("https://github.com/login/oauth/access_token")
                 .userInfoUri("https://api.github.com/user")

oauth2-custom-consent-page-with-vue/openid-provider/src/main/java/com/relive/config/AuthorizationServerConfig.java

@@ -14,7 +14,6 @@
 import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.authorization.OAuth2AuthorizationServerConfigurer;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
@@ -81,9 +80,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
         RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
 
         return http.requestMatcher(endpointsMatcher).authorizeRequests((authorizeRequests) -> {
-            ((ExpressionUrlAuthorizationConfigurer.AuthorizedUrl) authorizeRequests.anyRequest()).authenticated();
+            authorizeRequests.anyRequest().authenticated();
         }).csrf((csrf) -> {
-            csrf.ignoringRequestMatchers(new RequestMatcher[]{endpointsMatcher});
+            csrf.ignoringRequestMatchers(endpointsMatcher);
         }).apply(authorizationServerConfigurer)
                 .and()
                 .addFilterBefore(new BearerTokenAuthenticationFilter(

oauth2-introspection-with-jwt/oauth2-server-introspction-with-jwt/src/main/java/com/relive/config/SecurityConfig.java

@@ -32,9 +32,8 @@ SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Excepti
 
     @Bean
     UserDetailsService users() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-                .username("admin")
-                .password("password")
+        UserDetails user = User.withUsername("admin")
+                .password("{noop}password")
                 .roles("USER")
                 .build();
         return new InMemoryUserDetailsManager(user);

oauth2-jwt/oauth2-server/src/main/java/com/relive/config/DefaultSecurityConfig.java

@@ -35,9 +35,8 @@ SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Excepti
 
     @Bean
     UserDetailsService users() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-                .username("admin")
-                .password("password")
+        UserDetails user = User.withUsername("admin")
+                .password("{noop}password")
                 .roles("USER")
                 .build();
         return new InMemoryUserDetailsManager(user);

oauth2-login/authorizationserver/src/main/java/com/relive/config/DefaultSecurityConfig.java

@@ -43,9 +43,8 @@ public JwtDecoder jwtDecoder(JWKSource<SecurityContext> jwkSource) {
 
     @Bean
     public UserDetailsService users() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-                .username("admin")
-                .password("password")
+        UserDetails user = User.withUsername("admin")
+                .password("{noop}password")
                 .roles("ADMIN")
                 .build();
         return new InMemoryUserDetailsManager(user);

oauth2-opaque-token/oauth2-server-with-opaque-token/src/main/java/com/relive/config/SecurityConfig.java

@@ -32,9 +32,8 @@ SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Excepti
 
     @Bean
     UserDetailsService users() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-                .username("admin")
-                .password("password")
+        UserDetails user = User.withUsername("admin")
+                .password("{noop}password")
                 .roles("ADMIN")
                 .build();
         return new InMemoryUserDetailsManager(user);

oauth2-persistence-client/oauth2server/src/main/java/com/relive/config/DefaultSecurityConfig.java

@@ -35,9 +35,8 @@ SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Excepti
 
     @Bean
     UserDetailsService users() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-                .username("admin")
-                .password("password")
+        UserDetails user = User.withUsername("admin")
+                .password("{noop}password")
                 .roles("USER")
                 .build();
         return new InMemoryUserDetailsManager(user);

oauth2-pkce/pkce-oauth2-server/src/main/java/com/relive/config/SecurityConfig.java

@@ -32,9 +32,8 @@ SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Excepti
 
     @Bean
     UserDetailsService users() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-                .username("admin")
-                .password("password")
+        UserDetails user = User.withUsername("admin")
+                .password("{noop}password")
                 .roles("USER")
                 .build();
         return new InMemoryUserDetailsManager(user);

oidc-login/idp/src/main/java/com/relive/config/AuthorizationServerConfig.java

@@ -13,7 +13,6 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.authorization.OAuth2AuthorizationServerConfigurer;
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -69,9 +68,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
         RequestMatcher endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
 
         return http.requestMatcher(endpointsMatcher).authorizeRequests((authorizeRequests) -> {
-            ((ExpressionUrlAuthorizationConfigurer.AuthorizedUrl) authorizeRequests.anyRequest()).authenticated();
+            authorizeRequests.anyRequest().authenticated();
         }).csrf((csrf) -> {
-            csrf.ignoringRequestMatchers(new RequestMatcher[]{endpointsMatcher});
+            csrf.ignoringRequestMatchers(endpointsMatcher);
         }).apply(authorizationServerConfigurer)
                 .and()
                 .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt)