code review

Author: bnasslahsen

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

@@ -53,6 +53,8 @@ public class SwaggerWelcome extends AbstractSwaggerWelcome {
 
 	private String webJarsPrefixUrl;
 
+	private UriComponentsBuilder oauthPrefix;
+
 	public SwaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties) {
 		super(swaggerUiConfig, springDocConfigProperties);
 		this.webJarsPrefixUrl = springDocConfigProperties.getWebjars().getPrefix();
@@ -91,8 +93,9 @@ protected void calculateUiRootPath(StringBuilder... sbUrls) {
 
 	@Override
 	protected void calculateOauth2RedirectUrl(UriComponentsBuilder uriComponentsBuilder) {
-		if (!swaggerUiConfig.isValidUrl(swaggerUiConfig.getOauth2RedirectUrl())) {
-			swaggerUiConfig.setOauth2RedirectUrl(uriComponentsBuilder.path(this.uiRootPath).path(webJarsPrefixUrl).path(swaggerUiConfig.getOauth2RedirectUrl()).build().toString());
+		if (oauthPrefix == null && !swaggerUiConfig.isValidUrl(swaggerUiConfig.getOauth2RedirectUrl())) {
+			this.oauthPrefix = uriComponentsBuilder.path(this.uiRootPath).path(webJarsPrefixUrl);
+			swaggerUiConfig.setOauth2RedirectUrl(this.oauthPrefix.path(swaggerUiConfig.getOauth2RedirectUrl()).build().toString());
 		}
 	}
 

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3RedirectDefaultTest.java

@@ -18,11 +18,13 @@
 
 package test.org.springdoc.ui.app3;
 
+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 = {
@@ -33,6 +35,11 @@ public class SpringDocApp3RedirectDefaultTest extends AbstractSpringDocTest {
 
 	@Test
 	public void shouldRedirectWithDefaultQueryParams() throws Exception {
+		WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/documentation/swagger-ui.html").exchange()
+				.expectStatus().isTemporaryRedirect();
+		responseSpec.expectHeader()
+				.value("Location", Matchers.is("/documentation/webjars/swagger-ui/index.html?configUrl=/documentation/v3/api-docs/swagger-config"));
+
 		webTestClient.get().uri("/documentation/v3/api-docs/swagger-config").exchange()
 				.expectStatus().isOk().expectBody()
 				.jsonPath("$.validatorUrl").isEqualTo("")