Skip to content

Commit d8421d5

Browse files
author
Steve Riesenberg
committed
Simplify authorization server filter chain in samples
Closes gh-707
1 parent ed786c5 commit d8421d5

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

samples/custom-consent-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.context.annotation.Configuration;
2828
import org.springframework.core.Ordered;
2929
import org.springframework.core.annotation.Order;
30-
import org.springframework.security.config.Customizer;
3130
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3231
import org.springframework.security.config.annotation.web.configurers.oauth2.server.authorization.OAuth2AuthorizationServerConfigurer;
3332
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -41,6 +40,7 @@
4140
import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
4241
import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
4342
import org.springframework.security.web.SecurityFilterChain;
43+
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
4444
import org.springframework.security.web.util.matcher.RequestMatcher;
4545

4646
/**
@@ -69,8 +69,11 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
6969
authorizeRequests.anyRequest().authenticated()
7070
)
7171
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
72+
.exceptionHandling(exceptions ->
73+
exceptions.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login"))
74+
)
7275
.apply(authorizationServerConfigurer);
73-
return http.formLogin(Customizer.withDefaults()).build();
76+
return http.build();
7477
}
7578

7679
// @formatter:off

samples/default-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
3232
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
3333
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
34-
import org.springframework.security.config.Customizer;
3534
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3635
import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
3736
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -47,6 +46,7 @@
4746
import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
4847
import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
4948
import org.springframework.security.web.SecurityFilterChain;
49+
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
5050

5151
/**
5252
* @author Joe Grandja
@@ -59,7 +59,13 @@ public class AuthorizationServerConfig {
5959
@Order(Ordered.HIGHEST_PRECEDENCE)
6060
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
6161
OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http);
62-
return http.formLogin(Customizer.withDefaults()).build();
62+
// @formatter:off
63+
http
64+
.exceptionHandling(exceptions ->
65+
exceptions.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login"))
66+
);
67+
// @formatter:on
68+
return http.build();
6369
}
6470

6571
// @formatter:off

samples/federated-identity-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
3434
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
3535
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
36-
import org.springframework.security.config.Customizer;
3736
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3837
import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
3938
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -64,7 +63,7 @@ public class AuthorizationServerConfig {
6463
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
6564
OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http);
6665
http.apply(new FederatedIdentityConfigurer());
67-
return http.formLogin(Customizer.withDefaults()).build();
66+
return http.build();
6867
}
6968

7069
@Bean

0 commit comments

Comments
 (0)