From e18ec4813485b6ae39fc27c443c1ad571fd374b5 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 22 Mar 2024 16:27:16 -0600 Subject: [PATCH] Fix Test Issue gh-14553 --- .../oauth2/client/OidcBackChannelLogoutHandlerTests.java | 2 +- .../server/OidcBackChannelServerLogoutHandlerTests.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcBackChannelLogoutHandlerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcBackChannelLogoutHandlerTests.java index d43845e2b0..c1e4fe7da8 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcBackChannelLogoutHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcBackChannelLogoutHandlerTests.java @@ -29,7 +29,7 @@ public class OidcBackChannelLogoutHandlerTests { public void computeLogoutEndpointWhenDifferentHostnameThenLocalhost() { OidcBackChannelLogoutHandler logoutHandler = new OidcBackChannelLogoutHandler(); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/back-channel/logout"); - request.setRemoteHost("host.docker.internal"); + request.setServerName("host.docker.internal"); request.setServerPort(8090); String endpoint = logoutHandler.computeLogoutEndpoint(request); assertThat(endpoint).isEqualTo("http://localhost:8090/logout"); diff --git a/config/src/test/java/org/springframework/security/config/web/server/OidcBackChannelServerLogoutHandlerTests.java b/config/src/test/java/org/springframework/security/config/web/server/OidcBackChannelServerLogoutHandlerTests.java index 24d80abaec..51f8bb857d 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OidcBackChannelServerLogoutHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OidcBackChannelServerLogoutHandlerTests.java @@ -17,12 +17,8 @@ package org.springframework.security.config.web.server; import org.junit.jupiter.api.Test; -import reactor.core.publisher.Mono; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; -import org.springframework.mock.web.server.MockServerWebExchange; -import org.springframework.security.web.server.WebFilterExchange; -import org.springframework.web.server.ServerWebExchange; import static org.assertj.core.api.Assertions.assertThat; @@ -38,8 +34,7 @@ public class OidcBackChannelServerLogoutHandlerTests { MockServerHttpRequest request = MockServerHttpRequest .get("https://host.docker.internal:8090/back-channel/logout") .build(); - ServerWebExchange exchange = new MockServerWebExchange.Builder(request).build(); - String endpoint = logoutHandler.computeLogoutEndpoint(new WebFilterExchange(exchange, (ex) -> Mono.empty())); + String endpoint = logoutHandler.computeLogoutEndpoint(request); assertThat(endpoint).isEqualTo("https://localhost:8090/logout"); }