Skip to content

Commit 0f0c9c9

Browse files
committed
Remove FederatedIdentityConfigurer from demo sample
Issue gh-1208
1 parent 2a42bd5 commit 0f0c9c9

File tree

4 files changed

+16
-124
lines changed

4 files changed

+16
-124
lines changed

Diff for: docs/src/docs/asciidoc/guides/how-to-social-login.adoc

-35
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ Select from the following use cases to see an example of each:
123123

124124
* I want to <<advanced-use-cases-capture-users>>
125125
* I want to <<advanced-use-cases-map-claims>>
126-
* I want to <<advanced-use-cases-configurer>>
127126

128127
[[advanced-use-cases-capture-users]]
129128
=== Capture Users in a Database
@@ -166,37 +165,3 @@ public OAuth2TokenCustomizer<JwtEncodingContext> idTokenCustomizer() {
166165
return new FederatedIdentityIdTokenCustomizer();
167166
}
168167
----
169-
170-
[[advanced-use-cases-configurer]]
171-
=== Create My Own Configurer
172-
173-
The following example `SecurityConfigurer` combines configuration for all of the above examples into a single reusable component:
174-
175-
.`FederatedIdentityConfigurer`
176-
[source,java]
177-
----
178-
include::{samples-dir}/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityConfigurer.java[tags=imports;class]
179-
----
180-
181-
The configurer can be applied using the Spring Security DSL as in the following example:
182-
183-
.Apply Configurer
184-
[source,java]
185-
----
186-
http.apply(new FederatedIdentityConfigurer());
187-
----
188-
189-
The configurer also has its own DSL to customize the defaults.
190-
Here's a full example:
191-
192-
.Customize using Configurer
193-
[source,java]
194-
----
195-
http.apply(new FederatedIdentityConfigurer())
196-
.oauth2UserHandler((oauth2User) -> {
197-
// TODO: Handle login of an OAuth2 user...
198-
})
199-
.oidcUserHandler((oidcUser) -> {
200-
// TODO: Handle login of an OIDC user...
201-
});
202-
----

Diff for: samples/demo-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
import com.nimbusds.jose.jwk.source.JWKSource;
2323
import com.nimbusds.jose.proc.SecurityContext;
2424
import sample.authentication.DeviceClientAuthenticationProvider;
25-
import sample.jose.Jwks;
26-
import sample.federation.FederatedIdentityConfigurer;
2725
import sample.federation.FederatedIdentityIdTokenCustomizer;
26+
import sample.jose.Jwks;
2827
import sample.web.authentication.DeviceClientAuthenticationConverter;
2928

3029
import org.springframework.context.annotation.Bean;
@@ -121,8 +120,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(
121120
exceptions.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login"))
122121
)
123122
.oauth2ResourceServer(oauth2ResourceServer ->
124-
oauth2ResourceServer.jwt(Customizer.withDefaults()))
125-
.apply(new FederatedIdentityConfigurer());
123+
oauth2ResourceServer.jwt(Customizer.withDefaults()));
126124
// @formatter:on
127125
return http.build();
128126
}

Diff for: samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java

+14-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package sample.config;
1717

18+
import sample.federation.FederatedIdentityAuthenticationSuccessHandler;
19+
1820
import org.springframework.context.annotation.Bean;
1921
import org.springframework.context.annotation.Configuration;
2022
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -26,6 +28,7 @@
2628
import org.springframework.security.core.userdetails.UserDetailsService;
2729
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
2830
import org.springframework.security.web.SecurityFilterChain;
31+
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
2932
import org.springframework.security.web.session.HttpSessionEventPublisher;
3033

3134
/**
@@ -47,13 +50,23 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws
4750
.anyRequest().authenticated()
4851
)
4952
.formLogin(formLogin ->
50-
formLogin.loginPage("/login")
53+
formLogin
54+
.loginPage("/login")
55+
)
56+
.oauth2Login(oauth2Login ->
57+
oauth2Login
58+
.loginPage("/login")
59+
.successHandler(authenticationSuccessHandler())
5160
);
5261

5362
return http.build();
5463
}
5564
// @formatter:on
5665

66+
private AuthenticationSuccessHandler authenticationSuccessHandler() {
67+
return new FederatedIdentityAuthenticationSuccessHandler();
68+
}
69+
5770
// @formatter:off
5871
@Bean
5972
public UserDetailsService users() {

Diff for: samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityConfigurer.java

-84
This file was deleted.

0 commit comments

Comments
 (0)