File tree 2 files changed +9
-1
lines changed
springdoc-openapi-common/src/main/java/org/springdoc/core
springdoc-openapi-ui/src/main/java/org/springdoc/ui
2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -17,6 +17,8 @@ public final class Constants {
17
17
public static final String SPRINGDOC_SWAGGER_UI_CONFIG_URL ="springdoc.swagger-ui.configUrl" ;
18
18
public static final String SPRINGDOC_SWAGGER_UI_URL ="springdoc.swagger-ui.url" ;
19
19
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}}" ;
20
22
public static final String SPRINGDOC_SWAGGER_UI_CONFIG_URL_VALUE ="${" + SPRINGDOC_SWAGGER_UI_CONFIG_URL + ":#{null}}" ;
21
23
public static final String SPRINGDOC_SHOW_ACTUATOR = "springdoc.show-actuator" ;
22
24
public static final String SPRINGDOC_SHOW_ACTUATOR_VALUE = "${" + SPRINGDOC_SHOW_ACTUATOR + ":false}" ;
Original file line number Diff line number Diff line change @@ -43,6 +43,9 @@ class SwaggerWelcome implements InitializingBean {
43
43
@ Value (SPRINGDOC_SWAGGER_UI_URL_VALUE )
44
44
private String swaggerUiUrl ;
45
45
46
+ @ Value (SPRINGDOC_OAUTH2_REDIRECT_URL_VALUE )
47
+ private String oauth2RedirectUrl ;
48
+
46
49
@ Autowired
47
50
private SwaggerUiConfigProperties swaggerUiConfig ;
48
51
@@ -95,7 +98,10 @@ private void buildConfigUrl(HttpServletRequest request) {
95
98
} else
96
99
SwaggerUiConfigProperties .addUrl (url );
97
100
}
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 ())) {
99
105
swaggerUiConfig .setOauth2RedirectUrl (ServletUriComponentsBuilder .fromCurrentContextPath ().path (this .uiRootPath ).path (swaggerUiConfig .getOauth2RedirectUrl ()).build ().toString ());
100
106
}
101
107
}
You can’t perform that action at this time.
0 commit comments