github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enable audience handling in IAM for refresh token flow

pull/1611/head
Andrea Ceccanti 2020-01-15 21:50:34 +01:00
parent 2c48a4625c
commit 9d0967f529
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
View File

@ -360,23 +360,6 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi
token.setScope(authorizedScopes); token.setScope(authorizedScopes);
} }
// if (scope != null && !scope.isEmpty()) {
// // ensure a proper subset of scopes
// // FIXME: ugly and inefficient translation to/from strings for no added value, just to work around
// // a terribly designed API
// if (refreshScopes != null && scopeService.scopesMatch(scopeService.toStrings(refreshScopes), scopeService.toStrings(scope))) {
// // set the scope of the new access token if requested
// token.setScope(scopeService.toStrings(scope));
// } else {
// String errorMsg = "Up-scoping is not allowed.";
// logger.error(errorMsg);
// throw new InvalidScopeException(errorMsg);
// }
// } else {
// // otherwise inherit the scope of the refresh token (if it's there -- this can return a null scope set)
// token.setScope(scopeService.toStrings(refreshScopes));
// }
token.setClient(client); token.setClient(client);
if (client.getAccessTokenValiditySeconds() != null) { if (client.getAccessTokenValiditySeconds() != null) {
@ -398,6 +381,13 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi
token.setAuthenticationHolder(authHolder); token.setAuthenticationHolder(authHolder);
OAuth2Authentication auth = authHolder.getAuthentication();
// Pass down the audience to IAM specific logic
if (authRequest.getRequestParameters().containsKey("audience")) {
auth.getOAuth2Request().getExtensions().put("aud", authRequest.getRequestParameters().get("audience"));
}
tokenEnhancer.enhance(token, authHolder.getAuthentication()); tokenEnhancer.enhance(token, authHolder.getAuthentication());
tokenRepository.saveAccessToken(token); tokenRepository.saveAccessToken(token);