From 244cc87ed8fb879546f9ca3ea9adb21756d6ce8c Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Tue, 9 May 2023 15:37:31 -0500 Subject: [PATCH] Polish ref-doc Issue gh-1205 --- .../java/sample/userinfo/EnableUserInfoSecurityConfig.java | 5 +++-- .../userinfo/jwt/JwtUserInfoMapperSecurityConfig.java | 7 +++++-- .../examples/src/test/java/sample/jpa/JpaTests.java | 5 +++-- docs/src/docs/asciidoc/guides/how-to-userinfo.adoc | 2 +- docs/src/docs/asciidoc/protocol-endpoints.adoc | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java index 92c09bce..d8f6178f 100644 --- a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java +++ b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java @@ -33,7 +33,7 @@ import org.springframework.core.annotation.Order; import org.springframework.http.MediaType; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -54,6 +54,7 @@ import org.springframework.security.web.authentication.LoginUrlAuthenticationEnt import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher; @Configuration(proxyBeanMethods = false) +@EnableWebSecurity public class EnableUserInfoSecurityConfig { @Bean // <1> @@ -64,7 +65,7 @@ public class EnableUserInfoSecurityConfig { .oidc(Customizer.withDefaults()); // Enable OpenID Connect 1.0 // @formatter:off http - .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt) // <2> + .oauth2ResourceServer((oauth2) -> oauth2.jwt(Customizer.withDefaults())) // <2> .exceptionHandling((exceptions) -> exceptions .defaultAuthenticationEntryPointFor( new LoginUrlAuthenticationEntryPoint("/login"), diff --git a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java index 718c63d5..35f3b3c7 100644 --- a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java +++ b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java @@ -34,7 +34,7 @@ import org.springframework.core.annotation.Order; import org.springframework.http.MediaType; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -60,6 +60,7 @@ import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; @Configuration(proxyBeanMethods = false) +@EnableWebSecurity public class JwtUserInfoMapperSecurityConfig { @Bean // <1> @@ -90,7 +91,9 @@ public class JwtUserInfoMapperSecurityConfig { .anyRequest().authenticated() ) .csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher)) - .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt) // <4> + .oauth2ResourceServer(resourceServer -> resourceServer + .jwt(Customizer.withDefaults()) // <4> + ) .exceptionHandling((exceptions) -> exceptions .defaultAuthenticationEntryPointFor( new LoginUrlAuthenticationEntryPoint("/login"), diff --git a/docs/src/docs/asciidoc/examples/src/test/java/sample/jpa/JpaTests.java b/docs/src/docs/asciidoc/examples/src/test/java/sample/jpa/JpaTests.java index 7d051d5c..50991c88 100644 --- a/docs/src/docs/asciidoc/examples/src/test/java/sample/jpa/JpaTests.java +++ b/docs/src/docs/asciidoc/examples/src/test/java/sample/jpa/JpaTests.java @@ -43,7 +43,6 @@ import org.springframework.http.MediaType; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; import org.springframework.security.oauth2.core.oidc.endpoint.OidcParameterNames; import org.springframework.security.oauth2.jwt.JwtDecoder; @@ -209,7 +208,9 @@ public class JpaTests { new MediaTypeRequestMatcher(MediaType.TEXT_HTML) ) ) - .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt); + .oauth2ResourceServer((resourceServer) -> resourceServer + .jwt(Customizer.withDefaults()) + ); // @formatter:on return http.build(); } diff --git a/docs/src/docs/asciidoc/guides/how-to-userinfo.adoc b/docs/src/docs/asciidoc/guides/how-to-userinfo.adoc index f7b8db6f..cee5ca94 100644 --- a/docs/src/docs/asciidoc/guides/how-to-userinfo.adoc +++ b/docs/src/docs/asciidoc/guides/how-to-userinfo.adoc @@ -22,7 +22,7 @@ The following listing shows how to enable the {spring-security-reference-base-ur [[sample.userinfo]] include::code:EnableUserInfoSecurityConfig[] -TIP: Click on the "Expanded folded text" icon in the code sample above to display the full example. +TIP: Click on the "Expand folded text" icon in the code sample above to display the full example. This configuration provides the following: diff --git a/docs/src/docs/asciidoc/protocol-endpoints.adoc b/docs/src/docs/asciidoc/protocol-endpoints.adoc index 87874b2f..1c30209f 100644 --- a/docs/src/docs/asciidoc/protocol-endpoints.adoc +++ b/docs/src/docs/asciidoc/protocol-endpoints.adoc @@ -557,7 +557,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h ... - http.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt); + http.oauth2ResourceServer(resourceServer -> resourceServer.jwt(Customizer.withDefaults())); return http.build(); } @@ -650,7 +650,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h ... - http.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt); + http.oauth2ResourceServer(resourceServer -> resourceServer.jwt(Customizer.withDefaults())); return http.build(); }