Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-15 14:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Spring Boot 2.1.0.M3

Browse Source 
Fixes: gh-5843
This commit is contained in:
Rob Winch 2018-09-13 10:27:16 -05:00
parent f5c73a566a
commit f68141d42a
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,3 +1,3 @@
gaeVersion=1.9.64 gaeVersion=1.9.64
springBootVersion=2.1.0.M2 springBootVersion=2.1.0.M3
version=5.1.0.BUILD-SNAPSHOT version=5.1.0.BUILD-SNAPSHOT

8
samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java
View File

@ -21,9 +21,6 @@ import org.springframework.security.config.web.server.ServerHttpSecurity;
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.oauth2.client.ReactiveOAuth2AuthorizedClientService;
import org.springframework.security.oauth2.client.web.server.AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository;
import org.springframework.security.oauth2.client.web.server.ServerOAuth2AuthorizedClientRepository;
import org.springframework.security.web.server.SecurityWebFilterChain; import org.springframework.security.web.server.SecurityWebFilterChain;
/** /**
@ -47,11 +44,6 @@ public class SecurityConfig {
return http.build(); return http.build();
} }
@Bean
ServerOAuth2AuthorizedClientRepository authorizedClientRepository(ReactiveOAuth2AuthorizedClientService authorizedClientService) {
return new AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository(authorizedClientService);
}
@Bean @Bean
MapReactiveUserDetailsService userDetailsService() { MapReactiveUserDetailsService userDetailsService() {
UserDetails userDetails = User.withDefaultPasswordEncoder() UserDetails userDetails = User.withDefaultPasswordEncoder()

4
samples/boot/oauth2webclient/src/main/java/sample/OAuth2WebClientApplication.java
View File

@ -17,11 +17,13 @@ package sample;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.oauth2.client.reactive.ReactiveOAuth2ClientAutoConfiguration;
/** /**
* @author Joe Grandja * @author Joe Grandja
*/ */
@SpringBootApplication // FIXME: Work around https://github.com/spring-projects/spring-boot/issues/14463
@SpringBootApplication(exclude = ReactiveOAuth2ClientAutoConfiguration.class)
public class OAuth2WebClientApplication { public class OAuth2WebClientApplication {
public static void main(String[] args) { public static void main(String[] args) {

8
samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java
View File

@ -22,9 +22,6 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
import org.springframework.security.oauth2.client.web.AuthenticatedPrincipalOAuth2AuthorizedClientRepository;
import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.provisioning.InMemoryUserDetailsManager;
/** /**
@ -47,11 +44,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.oauth2Client(); .oauth2Client();
} }
@Bean
public OAuth2AuthorizedClientRepository authorizedClientRepository(OAuth2AuthorizedClientService authorizedClientService) {
return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(authorizedClientService);
}
@Bean @Bean
public UserDetailsService userDetailsService() { public UserDetailsService userDetailsService() {
UserDetails userDetails = User.withDefaultPasswordEncoder() UserDetails userDetails = User.withDefaultPasswordEncoder()