Skip to content

Commit a26292f

Browse files
author
bnasslahsen
committed
Dynamic oauth2RedirectUrl . Fixes #349
1 parent 5c166ad commit a26292f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public final class Constants {
1717
public static final String SPRINGDOC_SWAGGER_UI_CONFIG_URL ="springdoc.swagger-ui.configUrl";
1818
public static final String SPRINGDOC_SWAGGER_UI_URL ="springdoc.swagger-ui.url";
1919
public static final String SPRINGDOC_SWAGGER_UI_URL_VALUE ="${" + SPRINGDOC_SWAGGER_UI_URL + ":#{null}}";
20+
public static final String SPRINGDOC_OAUTH2_REDIRECT_URL ="springdoc.swagger-ui.oauth2RedirectUrl";
21+
public static final String SPRINGDOC_OAUTH2_REDIRECT_URL_VALUE ="${" + SPRINGDOC_OAUTH2_REDIRECT_URL + ":#{null}}";
2022
public static final String SPRINGDOC_SWAGGER_UI_CONFIG_URL_VALUE ="${" + SPRINGDOC_SWAGGER_UI_CONFIG_URL + ":#{null}}";
2123
public static final String SPRINGDOC_SHOW_ACTUATOR = "springdoc.show-actuator";
2224
public static final String SPRINGDOC_SHOW_ACTUATOR_VALUE = "${" + SPRINGDOC_SHOW_ACTUATOR + ":false}";

Diff for: springdoc-openapi-ui/src/main/java/org/springdoc/ui/SwaggerWelcome.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ class SwaggerWelcome implements InitializingBean {
4343
@Value(SPRINGDOC_SWAGGER_UI_URL_VALUE)
4444
private String swaggerUiUrl;
4545

46+
@Value(SPRINGDOC_OAUTH2_REDIRECT_URL_VALUE)
47+
private String oauth2RedirectUrl;
48+
4649
@Autowired
4750
private SwaggerUiConfigProperties swaggerUiConfig;
4851

@@ -95,7 +98,10 @@ private void buildConfigUrl(HttpServletRequest request) {
9598
} else
9699
SwaggerUiConfigProperties.addUrl(url);
97100
}
98-
if (!swaggerUiConfig.isValidUrl(swaggerUiConfig.getOauth2RedirectUrl())) {
101+
if(StringUtils.isEmpty(oauth2RedirectUrl)){
102+
swaggerUiConfig.setOauth2RedirectUrl(ServletUriComponentsBuilder.fromCurrentContextPath().path(this.uiRootPath).path(SWAGGER_UI_OAUTH_REDIRECT_URL).build().toString());
103+
}
104+
else if (!swaggerUiConfig.isValidUrl(swaggerUiConfig.getOauth2RedirectUrl())) {
99105
swaggerUiConfig.setOauth2RedirectUrl(ServletUriComponentsBuilder.fromCurrentContextPath().path(this.uiRootPath).path(swaggerUiConfig.getOauth2RedirectUrl()).build().toString());
100106
}
101107
}

0 commit comments

Comments
 (0)