oauth2 redirect url calculated incorrectly when springdoc.swagger-ui.path=/. Fixes #1035

Author: bnasslahsen

springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java

@@ -108,7 +108,7 @@ protected void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuil
 	private String fromCurrentContextPath(ServerHttpRequest request) {
 		String contextPath = request.getPath().contextPath().value();
 		String url = UriComponentsBuilder.fromHttpRequest(request).toUriString();
-		url = url.replace(request.getPath().toString(), "");
+		url = url.replace(request.getPath().toString(), "/");
 		buildConfigUrl(contextPath, UriComponentsBuilder.fromUriString(url));
 		return contextPath;
 	}

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthBasePathsTest.java

@@ -0,0 +1,53 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.ui.app4;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import test.org.springdoc.ui.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@TestPropertySource(properties = {
+		"springdoc.swagger-ui.path=/"
+})
+public class SpringDocOauthBasePathsTest extends AbstractSpringDocTest {
+
+	@Test
+	public void test_oauth2_default_base_path() throws Exception {
+
+		WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/").exchange()
+				.expectStatus().isTemporaryRedirect();
+		responseSpec.expectHeader()
+				.value("Location", Matchers.is("/webjars/swagger-ui/index.html?configUrl=/v3/api-docs/swagger-config"));
+
+		webTestClient.get().uri("/v3/api-docs/swagger-config").exchange()
+				.expectStatus().isOk().expectBody()
+				.jsonPath("$.validatorUrl").isEqualTo("")
+				.jsonPath("$.oauth2RedirectUrl").isEqualTo("/webjars/swagger-ui/oauth2-redirect.html");
+
+	}
+
+
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+}