Skip to content

Mvn repo #3416

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

Closed
eyals24 wants to merge 2 commits into from
Closed

Mvn repo #3416

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
738b7db
OAuth security schema is used but OAuth related files are not generat…
eyals24 Jul 22, 2019
8a8554c
Add test for java OAuth2 client
eyals24 Jul 22, 2019
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
OAuth security schema is used but OAuth related files are not generated 
#3305
  • Loading branch information
@eyals24
eyals24 committed Jul 22, 2019
commit 738b7dba342719c3e31d3f3b94ef4cdc61215f74
25 changes: 24 additions & 1 deletion ...openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

package org.openapitools.codegen.languages;

import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.security.SecurityScheme;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.*;
Expand Down Expand Up @@ -499,8 +502,28 @@ public int compare(CodegenParameter one, CodegenParameter another) {
supportingFiles.add(new SupportingFile("auth/RetryingOAuth.mustache", authFolder, "RetryingOAuth.java"));
}

boolean isOAuth = Optional
.ofNullable(this.openAPI)
.map(OpenAPI::getComponents)
.map(Components::getSecuritySchemes)
.map(v -> !v.isEmpty())
.orElse(false)

&&

this
.openAPI
.getComponents()
.getSecuritySchemes()
.values()
.stream()
.findFirst()
.map(SecurityScheme::getType)
.map(v -> v.equals(SecurityScheme.Type.OAUTH2))
.orElse(false);

// google-api-client doesn't use the OpenAPI auth, because it uses Google Credential directly (HttpRequestInitializer)
if ((!(GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || usePlayWS)) && ProcessUtils.hasOAuthMethods(objs)) {
if ((!(GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || usePlayWS)) && (ProcessUtils.hasOAuthMethods(objs) || isOAuth)) {
supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
supportingFiles.add(new SupportingFile("auth/OAuthFlow.mustache", authFolder, "OAuthFlow.java"));
}
Expand Down