Эх сурвалжийг харах

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

Josh Cummings 1 сар өмнө
parent
commit
77b73d412d

+ 1 - 1
reactive/webflux/java/oauth2/login/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

+ 2 - 1
reactive/webflux/java/oauth2/login/src/main/java/example/LoopbackIpRedirectWebFilter.java

@@ -54,7 +54,8 @@ public class LoopbackIpRedirectWebFilter implements WebFilter {
 	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 		String host = exchange.getRequest().getURI().getHost();
 		if (host != null && host.equals("localhost")) {
-			UriComponents uri = UriComponentsBuilder.fromHttpRequest(exchange.getRequest()).host("127.0.0.1").build();
+			UriComponents uri = UriComponentsBuilder.fromUri(exchange.getRequest().getURI())
+				.host("127.0.0.1").build();
 			exchange.getResponse().setStatusCode(HttpStatus.PERMANENT_REDIRECT);
 			exchange.getResponse().getHeaders().setLocation(uri.toUri());
 			return Mono.empty();

+ 4 - 0
reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java

@@ -18,7 +18,9 @@ package example;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
@@ -29,6 +31,7 @@ import org.springframework.security.oauth2.client.web.server.ServerOAuth2Authori
 import org.springframework.security.oauth2.client.web.server.WebSessionServerOAuth2AuthorizedClientRepository;
 import org.springframework.security.web.reactive.result.method.annotation.AuthenticationPrincipalArgumentResolver;
 import org.springframework.security.web.server.context.SecurityContextServerWebExchangeWebFilter;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.result.view.ViewResolver;
 
@@ -40,6 +43,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
  * @author Josh Cummings
  */
 @WebFluxTest(OAuth2LoginController.class)
+@ExtendWith(MockitoExtension.class)
 public class OAuth2LoginControllerTests {
 
 	@Autowired