Ver código fonte

Update :reactive:webflux:java:oauth2:webclient to 7

Josh Cummings 1 mês atrás
pai
commit
c1b6bf4a71

+ 1 - 1
reactive/webflux/java/oauth2/webclient/build.gradle

@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-	implementation 'org.springframework:spring-webflux'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 	implementation 'io.projectreactor.netty:reactor-netty'

+ 1 - 1
reactive/webflux/java/oauth2/webclient/gradle.properties

@@ -1,4 +1,4 @@
 version=6.1.1
-spring-security.version=6.5.0-SNAPSHOT
+spring-security.version=7.0.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true

+ 0 - 1
reactive/webflux/java/oauth2/webclient/src/main/java/example/WebClientConfiguration.java

@@ -64,7 +64,6 @@ public class WebClientConfiguration {
 				.authorizationCode()
 				.refreshToken()
 				.clientCredentials()
-				.password()
 				.build();
 		// @formatter:on
 		DefaultReactiveOAuth2AuthorizedClientManager authorizedClientManager = new DefaultReactiveOAuth2AuthorizedClientManager(

+ 0 - 5
reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java

@@ -24,11 +24,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.server.ServerOAuth2AuthorizedClientRepository;
 import org.springframework.security.oauth2.client.web.server.WebSessionServerOAuth2AuthorizedClientRepository;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -47,9 +45,6 @@ public class OAuth2WebClientControllerTests {
 	@Autowired
 	private WebTestClient client;
 
-	@MockBean
-	ReactiveClientRegistrationRepository clientRegistrationRepository;
-
 	@AfterAll
 	static void shutdown() throws Exception {
 		web.shutdown();

+ 0 - 5
reactive/webflux/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java

@@ -24,11 +24,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.server.ServerOAuth2AuthorizedClientRepository;
 import org.springframework.security.oauth2.client.web.server.WebSessionServerOAuth2AuthorizedClientRepository;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -47,9 +45,6 @@ public class RegisteredOAuth2AuthorizedClientControllerTests {
 	@Autowired
 	private WebTestClient client;
 
-	@MockBean
-	ReactiveClientRegistrationRepository clientRegistrationRepository;
-
 	@AfterAll
 	static void shutdown() throws Exception {
 		web.shutdown();