Skip to content
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

Jump to bottom

Discover client method from discovery endpoint #650

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Discover client method from discovery endpoint #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions vertx-auth-oauth2/src/main/java/io/vertx/ext/auth/oauth2/providers/AppleIdAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ static OAuth2Auth create(Vertx vertx, String clientId, String teamId, PubSecKeyO
.setTokenPath("/auth/token")
.setRevocationPath("/auth/revoke")
.setAuthorizationPath("/auth/authorize")
.setJwkPath("/auth/keys"));
.setJwkPath("/auth/keys")
.setUseBasicAuthorization(false));
}

/**
Expand Down Expand Up @@ -116,7 +117,6 @@ static Future<OAuth2Auth> discover(final Vertx vertx, final PubSecKeyOptions pri
vertx,
new OAuth2Options(config)
.setSite(site)
.setClientSecret(clientSecret)
.setUseBasicAuthorization(false));
.setClientSecret(clientSecret));
}
}
20 changes: 16 additions & 4 deletions vertx-auth-oauth2/src/main/java/io/vertx/ext/auth/oauth2/providers/OpenIDConnectAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,28 @@ static Future<OAuth2Auth> discover(final Vertx vertx, final OAuth2Options config
jwtOptions.setIssuer(json.getString("issuer"));
}


// reset config
config.setSupportedGrantTypes(null);

if (json.containsKey("grant_types_supported")) {
// reset config
config.setSupportedGrantTypes(null);
// optional config
JsonArray flows = json.getJsonArray("grant_types_supported");
flows.forEach(el -> config.addSupportedGrantType((String) el));
}

// configure client authentication
if (json.containsKey("token_endpoint_auth_methods_supported")) {
// optional
JsonArray methods = json.getJsonArray("token_endpoint_auth_methods_supported");
if (methods.contains("client_secret_basic")) {
// preferred
config.setUseBasicAuthorization(true);
} else if (methods.contains("client_secret_post")) {
config.setUseBasicAuthorization(false);
} else {
// default to what is defined by the callee
}
}

try {
// the constructor might fail if the configuration is incomplete
final OAuth2Auth oidc = OAuth2Auth.create(vertx, config);
Expand Down