Skip to content

Commit 3c96e31

Browse files
author
bnasslahsen
committed
springdoc.swagger-ui.oauth.additionalQueryStringParams should be map instead of list. fixes #567
1 parent 36131c8 commit 3c96e31

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,10 @@ static void put(final String name, final String value, final Map<String, Object>
5151
}
5252
}
5353

54+
static void put(String name, Map<String,String> value, Map<String, Object> params) {
55+
if (!CollectionUtils.isEmpty(value)) {
56+
params.put(name, value);
57+
}
58+
}
59+
5460
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.springdoc.core;
2020

2121

22-
import java.util.List;
2322
import java.util.Map;
2423
import java.util.TreeMap;
2524

@@ -51,7 +50,7 @@ public class SwaggerUiOAuthProperties {
5150

5251
private String scopeSeparator;
5352

54-
private List<String> additionalQueryStringParams;
53+
private Map<String,String> additionalQueryStringParams;
5554

5655
private String useBasicAuthenticationWithAccessCodeGrant;
5756

@@ -110,11 +109,11 @@ public void setScopeSeparator(String scopeSeparator) {
110109
this.scopeSeparator = scopeSeparator;
111110
}
112111

113-
public List<String> getAdditionalQueryStringParams() {
112+
public Map<String, String> getAdditionalQueryStringParams() {
114113
return additionalQueryStringParams;
115114
}
116115

117-
public void setAdditionalQueryStringParams(List<String> additionalQueryStringParams) {
116+
public void setAdditionalQueryStringParams(Map<String, String> additionalQueryStringParams) {
118117
this.additionalQueryStringParams = additionalQueryStringParams;
119118
}
120119

springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app7/SpringDocApp7Test.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
3131
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
3232

33-
@TestPropertySource(properties = "springdoc.swagger-ui.oauth.clientId=myClientId")
33+
@TestPropertySource(properties = { "springdoc.swagger-ui.oauth.clientId=myClientId",
34+
"springdoc.swagger-ui.oauth.additionalQueryStringParams.test1=test1",
35+
"springdoc.swagger-ui.oauth.additionalQueryStringParams.test2=test2" })
3436
public class SpringDocApp7Test extends AbstractSpringDocTest {
3537

3638
@Test

springdoc-openapi-ui/src/test/resources/results/app7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
window.ui = ui
5757
ui.initOAuth(
58-
{"clientId":"myClientId"})
58+
{"additionalQueryStringParams":{"test1":"test1","test2":"test2"},"clientId":"myClientId"})
5959
}
6060
</script>
6161
</body>

0 commit comments

Comments
 (0)