Skip to content

[Java] fix runtime exception when there are multiple auth methods #5530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Mar 10, 2020
Merged

[Java] fix runtime exception when there are multiple auth methods #5530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eeaa72b
fix runtime exception when there are multiple auth methods
sebastien-rosset Mar 5, 2020
b0ed73e
Merge remote-tracking branch 'origin' into java-multiple-auth-methods
sebastien-rosset Mar 5, 2020
218756f
Refactor a bit so that it does not cause conflict with relative url t…
sebastien-rosset Mar 5, 2020
ca7bf2b
Merge remote-tracking branch 'origin' into java-multiple-auth-methods
sebastien-rosset Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix runtime exception when there are multiple auth methods
  • Loading branch information
@sebastien-rosset
sebastien-rosset committed Mar 5, 2020
commit eeaa72b014a42e716bb473c177960a71380ae0bf
4 changes: 4 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ public class ApiClient {
public ApiClient(String clientId, String clientSecret, Map<String, String> parameters) {
init();

// Setup authentications (key: authentication name, value: authentication).{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{^isBasicBasic}}
authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}
authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"cookie"{{/isKeyInCookie}}, "{{keyParamName}}"));{{/isApiKey}}{{/authMethods}}
{{#hasOAuthMethods}}
RetryingOAuth retryingOAuth = new RetryingOAuth("{{tokenUrl}}", clientId, OAuthFlow.{{flow}}, clientSecret, parameters);
authentications.put(
Expand Down
4 changes: 4 additions & 0 deletions ...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ public ApiClient(String clientId, Map<String, String> parameters) {
public ApiClient(String clientId, String clientSecret, Map<String, String> parameters) {
init();

// Setup authentications (key: authentication name, value: authentication).
authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
authentications.put("http_basic_test", new HttpBasicAuth());
RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters);
authentications.put(
"petstore_auth",
Expand Down
4 changes: 4 additions & 0 deletions ...les/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ public ApiClient(String clientId, Map<String, String> parameters) {
public ApiClient(String clientId, String clientSecret, Map<String, String> parameters) {
init();

// Setup authentications (key: authentication name, value: authentication).
authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
authentications.put("http_basic_test", new HttpBasicAuth());
RetryingOAuth retryingOAuth = new RetryingOAuth("", clientId, OAuthFlow.implicit, clientSecret, parameters);
authentications.put(
"petstore_auth",
Expand Down