Provide oauth2RedirectUrl, if not declared. Fixes #320

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/Constants.java

@@ -20,6 +20,7 @@ public final class Constants {
     public static final String DEFAULT_WEB_JARS_PREFIX_URL = "/webjars";
     public static final String WEB_JARS_PREFIX_URL = "${springdoc.webjars.prefix:#{T(org.springdoc.core.Constants).DEFAULT_WEB_JARS_PREFIX_URL}}";
     public static final String SWAGGER_UI_URL = "/swagger-ui/index.html";
+    public static final String  SWAGGER_UI_OAUTH_REDIRECT_URL  = "/swagger-ui/oauth2-redirect.html";
     public static final String APPLICATION_OPENAPI_YAML = "application/vnd.oai.openapi";
     public static final String DEFAULT_SWAGGER_UI_PATH = DEFAULT_PATH_SEPARATOR + "swagger-ui.html";
     public static final String SWAGGER_UI_PATH = "${springdoc.swagger-ui.path:#{T(org.springdoc.core.Constants).DEFAULT_SWAGGER_UI_PATH}}";

springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfigProperties.java

@@ -16,6 +16,7 @@
 import java.util.stream.Collectors;
 
 import static org.springdoc.core.Constants.SPRINGDOC_SWAGGER_UI_ENABLED;
+import static org.springdoc.core.Constants.SWAGGER_UI_OAUTH_REDIRECT_URL;
 import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
 
 /**
@@ -109,7 +110,7 @@ public class SwaggerUiConfigProperties {
     /**
      * OAuth redirect URL.
      */
-    private String oauth2RedirectUrl;
+    private String oauth2RedirectUrl=SWAGGER_UI_OAUTH_REDIRECT_URL;
     private String url;
 
     public static void addGroup(String group) {

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

@@ -42,14 +42,7 @@ class SwaggerWelcome {
     @Operation(hidden = true)
     @GetMapping(SWAGGER_UI_PATH)
     public String redirectToUi(HttpServletRequest request) {
-        String uiRootPath = "";
-        if (swaggerPath.contains("/"))
-            uiRootPath = swaggerPath.substring(0, swaggerPath.lastIndexOf('/'));
-        StringBuilder sbUrl = new StringBuilder();
-        sbUrl.append(REDIRECT_URL_PREFIX);
-        if (StringUtils.isNotBlank(mvcServletPath))
-            sbUrl.append(mvcServletPath);
-        sbUrl.append(uiRootPath);
+        StringBuilder sbUrl = new StringBuilder(REDIRECT_URL_PREFIX).append(this.calculateUiRootPath());
         sbUrl.append(SWAGGER_UI_URL);
         buildConfigUrl(request);
         UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromUriString(sbUrl.toString());
@@ -87,7 +80,18 @@ private void buildConfigUrl(HttpServletRequest request) {
 
         }
         if (!swaggerUiConfig.isValidUrl(swaggerUiConfig.getOauth2RedirectUrl())) {
-            swaggerUiConfig.setOauth2RedirectUrl(ServletUriComponentsBuilder.fromCurrentContextPath().path(swaggerUiConfig.getOauth2RedirectUrl()).build().toString());
+            swaggerUiConfig.setOauth2RedirectUrl(ServletUriComponentsBuilder.fromCurrentContextPath().path(this.calculateUiRootPath().append(swaggerUiConfig.getOauth2RedirectUrl()).toString()).build().toString());
         }
     }
+
+    private StringBuilder calculateUiRootPath() {
+        String uiRootPath = "";
+        if (swaggerPath.contains("/"))
+            uiRootPath = swaggerPath.substring(0, swaggerPath.lastIndexOf('/'));
+        StringBuilder sbUrl = new StringBuilder();
+        if (StringUtils.isNotBlank(mvcServletPath))
+            sbUrl.append(mvcServletPath);
+        sbUrl.append(uiRootPath);
+        return sbUrl;
+    }
 }