Repository: cxf-fediz Updated Branches: refs/heads/master 245c592d7 -> b73fd0220
Adjusting a bit the way the role claim is checked Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b73fd022 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b73fd022 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b73fd022 Branch: refs/heads/master Commit: b73fd0220cf32a41f70e84e8124f3a3c62f819f6 Parents: 245c592 Author: Sergey Beryozkin <[email protected]> Authored: Fri Jul 7 12:28:08 2017 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Fri Jul 7 12:28:08 2017 +0100 ---------------------------------------------------------------------- .../fediz/service/oidc/FedizSubjectCreator.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b73fd022/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java index 090cfd4..9674717 100644 --- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java +++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java @@ -196,13 +196,17 @@ public class FedizSubjectCreator implements SubjectCreator { } if (roles != null && !roles.isEmpty() - && supportedClaims.containsKey(FedizConstants.DEFAULT_ROLE_URI.toString()) - && requestedClaimsList.contains(supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI.toString()))) { - if (roles.size() == 1) { - idToken.setClaim(supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI.toString()), roles.get(0)); - } else { - idToken.setClaim(supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI.toString()), roles); - } + && supportedClaims.containsKey(FedizConstants.DEFAULT_ROLE_URI)) { + + String roleClaimName = supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI); + + if (requestedClaimsList.contains(roleClaimName)) { + if (roles.size() == 1) { + idToken.setClaim(roleClaimName, roles.get(0)); + } else { + idToken.setClaim(roleClaimName, roles); + } + } } return idToken;
