Calling Swagger UI via different context paths fails. Fixes #2642

Author: bnasslahsen

springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexPageTransformer.java

@@ -69,8 +69,7 @@ public SwaggerIndexPageTransformer(SwaggerUiConfigProperties swaggerUiConfig, Sw
 
 	@Override
 	public Mono<Resource> transform(ServerWebExchange serverWebExchange, Resource resource, ResourceTransformerChain resourceTransformerChain) {
-		if (swaggerUiConfigParameters.getConfigUrl() == null)
-			swaggerWelcomeCommon.buildFromCurrentContextPath(serverWebExchange.getRequest());
+		swaggerWelcomeCommon.buildFromCurrentContextPath(serverWebExchange.getRequest());
 
 		final AntPathMatcher antPathMatcher = new AntPathMatcher();
 		try {

springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexPageTransformer.java

@@ -69,8 +69,7 @@ public SwaggerIndexPageTransformer(SwaggerUiConfigProperties swaggerUiConfig, Sw
 	@Override
 	public Resource transform(HttpServletRequest request, Resource resource,
 			ResourceTransformerChain transformerChain) throws IOException {
-		if (swaggerUiConfigParameters.getConfigUrl() == null)
-			swaggerWelcomeCommon.buildFromCurrentContextPath(request);
+		swaggerWelcomeCommon.buildFromCurrentContextPath(request);
 
 		final AntPathMatcher antPathMatcher = new AntPathMatcher();
 		boolean isIndexFound = antPathMatcher.match("**/swagger-ui/**/" + SWAGGER_INITIALIZER_JS, resource.getURL().toString());

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java

@@ -18,6 +18,7 @@
 
 package test.org.springdoc.ui;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springdoc.core.utils.Constants;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -33,22 +34,28 @@ public abstract class AbstractSpringDocTest extends AbstractCommonTest {
 
 	public static String className;
 
-	protected void checkJS(String fileName, String uri) throws Exception {
-		MvcResult mvcResult = mockMvc.perform(get(uri)).andExpect(status().isOk()).andReturn();
+	protected void checkJS(String fileName, String uri, String contextPath) throws Exception {
+		MvcResult mvcResult = mockMvc.perform(get(contextPath+uri).contextPath(contextPath)).andExpect(status().isOk()).andReturn();
 		String transformedIndex = mvcResult.getResponse().getContentAsString();
 		assertTrue(transformedIndex.contains("window.ui"));
 		assertEquals("no-store", mvcResult.getResponse().getHeader("Cache-Control"));
 		assertEquals(this.getContent(fileName), transformedIndex.replace("\r", ""));
 	}
 
-	protected void chekJS(String fileName) throws Exception {
-		checkJS(fileName, Constants.SWAGGER_INITIALIZER_URL);
+	protected void chekJS(String fileName,String contextPath) throws Exception {
+		checkJS(fileName, Constants.SWAGGER_INITIALIZER_URL,contextPath);
+	}
+
+	protected void chekJS(String contextPath) throws Exception {
+		className = getClass().getSimpleName();
+		String testNumber = className.replaceAll("[^0-9]", "");
+		checkJS("results/app" + testNumber, Constants.SWAGGER_INITIALIZER_URL,contextPath);
 	}
 
 	protected void chekJS() throws Exception {
 		className = getClass().getSimpleName();
 		String testNumber = className.replaceAll("[^0-9]", "");
-		checkJS("results/app" + testNumber, Constants.SWAGGER_INITIALIZER_URL);
+		checkJS("results/app" + testNumber, Constants.SWAGGER_INITIALIZER_URL, StringUtils.EMPTY);
 	}
 
 	protected void checkJSResult(String fileName, String htmlResult) throws Exception {

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocAppRedirectWithPrefixTest.java

@@ -18,6 +18,7 @@
 
 package test.org.springdoc.ui.app1;
 
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.springdoc.core.utils.Constants;
 import test.org.springdoc.ui.AbstractSpringDocTest;
@@ -45,7 +46,7 @@ public void shouldRedirectWithPrefix() throws Exception {
 				.andExpect(jsonPath("validatorUrl", equalTo("")))
 				.andExpect(jsonPath("oauth2RedirectUrl", equalTo("http://localhost/documentation/swagger-ui/oauth2-redirect.html")));
 
-		super.checkJS("results/app1-prefix", "/documentation" + Constants.SWAGGER_INITIALIZER_URL);
+		super.checkJS("results/app1-prefix", "/documentation" + Constants.SWAGGER_INITIALIZER_URL, StringUtils.EMPTY);
 	}
 
 	@SpringBootApplication

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocApp5Test.java

@@ -28,16 +28,19 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static test.org.springdoc.ui.app5.SpringDocApp5Test.CONTEXT_PATH;
 
-@TestPropertySource(properties = "server.servlet.context-path=/context-path")
+@TestPropertySource(properties = "server.servlet.context-path="+CONTEXT_PATH)
 public class SpringDocApp5Test extends AbstractSpringDocTest {
 
+	public static final String CONTEXT_PATH = "/context-path";
+
 	@Test
 	public void oauth2_redirect_url_calculated_with_context_path() throws Exception {
-		mockMvc.perform(get("/context-path/v3/api-docs/swagger-config").contextPath("/context-path"))
+		mockMvc.perform(get(CONTEXT_PATH+"/v3/api-docs/swagger-config").contextPath("/context-path"))
 				.andExpect(status().isOk())
 				.andExpect(jsonPath("oauth2RedirectUrl", equalTo("http://localhost/context-path/swagger-ui/oauth2-redirect.html")));
-		super.chekJS();
+		super.chekJS(CONTEXT_PATH);
 	}
 
 	@SpringBootApplication