Skip to content

Commit 51f266b

Browse files
author
Steve Riesenberg
committed
Update exception handling config in ref-doc
Closes spring-projectsgh-1205
1 parent 64ddcfc commit 51f266b

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

docs/src/docs/asciidoc/examples/src/main/java/sample/gettingStarted/SecurityConfig.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.core.annotation.Order;
33+
import org.springframework.http.MediaType;
3334
import org.springframework.security.config.Customizer;
3435
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3536
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -50,6 +51,7 @@
5051
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
5152
import org.springframework.security.web.SecurityFilterChain;
5253
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
54+
import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;
5355

5456
@Configuration
5557
@EnableWebSecurity
@@ -67,8 +69,10 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
6769
// Redirect to the login page when not authenticated from the
6870
// authorization endpoint
6971
.exceptionHandling((exceptions) -> exceptions
70-
.authenticationEntryPoint(
71-
new LoginUrlAuthenticationEntryPoint("/login"))
72+
.defaultAuthenticationEntryPointFor(
73+
new LoginUrlAuthenticationEntryPoint("/login"),
74+
new MediaTypeRequestMatcher(MediaType.TEXT_HTML)
75+
)
7276
)
7377
// Accept access tokens for User Info and/or Client Registration
7478
.oauth2ResourceServer((oauth2) -> oauth2.jwt(Customizer.withDefaults()));

docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.core.annotation.Order;
33+
import org.springframework.http.MediaType;
3334
import org.springframework.security.config.Customizer;
3435
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3536
import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
@@ -50,6 +51,7 @@
5051
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
5152
import org.springframework.security.web.SecurityFilterChain;
5253
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
54+
import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;
5355

5456
@Configuration(proxyBeanMethods = false)
5557
public class EnableUserInfoSecurityConfig {
@@ -64,7 +66,10 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
6466
http
6567
.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt) // <2>
6668
.exceptionHandling((exceptions) -> exceptions
67-
.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login"))
69+
.defaultAuthenticationEntryPointFor(
70+
new LoginUrlAuthenticationEntryPoint("/login"),
71+
new MediaTypeRequestMatcher(MediaType.TEXT_HTML)
72+
)
6873
);
6974
// @formatter:on
7075

docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.springframework.context.annotation.Bean;
3232
import org.springframework.context.annotation.Configuration;
3333
import org.springframework.core.annotation.Order;
34+
import org.springframework.http.MediaType;
3435
import org.springframework.security.config.Customizer;
3536
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3637
import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
@@ -55,6 +56,7 @@
5556
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
5657
import org.springframework.security.web.SecurityFilterChain;
5758
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
59+
import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;
5860
import org.springframework.security.web.util.matcher.RequestMatcher;
5961

6062
@Configuration(proxyBeanMethods = false)
@@ -90,7 +92,10 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
9092
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
9193
.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt) // <4>
9294
.exceptionHandling((exceptions) -> exceptions
93-
.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login"))
95+
.defaultAuthenticationEntryPointFor(
96+
new LoginUrlAuthenticationEntryPoint("/login"),
97+
new MediaTypeRequestMatcher(MediaType.TEXT_HTML)
98+
)
9499
)
95100
.apply(authorizationServerConfigurer); // <5>
96101
// @formatter:on

0 commit comments

Comments
 (0)