Skip to content

Commit 88ae36e

Browse files
#12656 fix HTML-escaped token and authorization URLs in Java based libraries (#12677)
1 parent 2c9bd4a commit 88ae36e

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class ApiClient {
8383
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"cookie"{{/isKeyInCookie}}, "{{keyParamName}}");
8484
{{/isApiKey}}
8585
{{#isOAuth}}
86-
auth = buildOauthRequestInterceptor(OAuthFlow.{{#lambda.uppercase}}{{#lambda.snakecase}}{{flow}}{{/lambda.snakecase}}{{/lambda.uppercase}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{^-last}}, {{/-last}}{{/scopes}}");
86+
auth = buildOauthRequestInterceptor(OAuthFlow.{{#lambda.uppercase}}{{#lambda.snakecase}}{{flow}}{{/lambda.snakecase}}{{/lambda.uppercase}}, "{{{authorizationUrl}}}", "{{{tokenUrl}}}", "{{#scopes}}{{scope}}{{^-last}}, {{/-last}}{{/scopes}}");
8787
{{/isOAuth}}
8888
} else {{/authMethods}}{
8989
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
227227
if (auth instanceof OAuth) {
228228
authentications.put("{{name}}", auth);
229229
} else {
230-
authentications.put("{{name}}", new OAuth(basePath, "{{tokenUrl}}"));
230+
authentications.put("{{name}}", new OAuth(basePath, "{{{tokenUrl}}}"));
231231
}
232232
{{/isOAuth}}
233233
{{/authMethods}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
227227
if (auth instanceof OAuth) {
228228
authentications.put("{{name}}", auth);
229229
} else {
230-
authentications.put("{{name}}", new OAuth(basePath, "{{tokenUrl}}"));
230+
authentications.put("{{name}}", new OAuth(basePath, "{{{tokenUrl}}}"));
231231
}
232232
{{/isOAuth}}
233233
{{/authMethods}}

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public class ApiClient {
180180
}
181181

182182
{{#hasOAuthMethods}}
183-
String tokenUrl = "{{tokenUrl}}";
183+
String tokenUrl = "{{{tokenUrl}}}";
184184
if (!"".equals(tokenUrl) && !URI.create(tokenUrl).isAbsolute()) {
185185
URI uri = URI.create(getBasePath());
186186
tokenUrl = uri.getScheme() + ":" +

modules/openapi-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class ApiClient {
7373
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"cookie"{{/isKeyInCookie}}, "{{keyParamName}}");
7474
{{/isApiKey}}
7575
{{#isOAuth}}
76-
auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{^-last}}, {{/-last}}{{/scopes}}");
76+
auth = new OAuth(OAuthFlow.{{flow}}, "{{{authorizationUrl}}}", "{{{tokenUrl}}}", "{{#scopes}}{{scope}}{{^-last}}, {{/-last}}{{/scopes}}");
7777
{{/isOAuth}}
7878
} else {{/authMethods}}{
7979
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class ApiClient {
7777
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"cookie"{{/isKeyInCookie}}, "{{keyParamName}}");
7878
{{/isApiKey}}
7979
{{#isOAuth}}
80-
auth = new OAuth(OAuthFlow.{{#lambda.uppercase}}{{#lambda.snakecase}}{{flow}}{{/lambda.snakecase}}{{/lambda.uppercase}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{^-last}}, {{/-last}}{{/scopes}}");
80+
auth = new OAuth(OAuthFlow.{{#lambda.uppercase}}{{#lambda.snakecase}}{{flow}}{{/lambda.snakecase}}{{/lambda.uppercase}}, "{{{authorizationUrl}}}", "{{{tokenUrl}}}", "{{#scopes}}{{scope}}{{^-last}}, {{/-last}}{{/scopes}}");
8181
{{/isOAuth}}
8282
} else {{/authMethods}}{
8383
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");

0 commit comments

Comments
 (0)