Repository: cxf Updated Branches: refs/heads/master 68b0b2d51 -> 8cf96594e
[CXF-5705] Updating OAuthAuthorizationdata witha cert property to let view handlers optionally include a link to he client public cert for the current user to check Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8cf96594 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8cf96594 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8cf96594 Branch: refs/heads/master Commit: 8cf96594e33300f89272ca7be1924b5474e565e3 Parents: 68b0b2d Author: Sergey Beryozkin <[email protected]> Authored: Wed Apr 30 14:31:56 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Apr 30 14:31:56 2014 +0100 ---------------------------------------------------------------------- .../rs/security/oauth2/common/OAuthAuthorizationData.java | 9 +++++++++ .../oauth2/services/RedirectionBasedGrantService.java | 1 + 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8cf96594/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java index 5b19a21..0b98d08 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java @@ -48,6 +48,7 @@ public class OAuthAuthorizationData implements Serializable { private String applicationWebUri; private String applicationDescription; private String applicationLogoUri; + private String applicationCertificate; private Map<String, String> extraApplicationProperties = new HashMap<String, String>(); private List<? extends Permission> permissions; @@ -262,4 +263,12 @@ public class OAuthAuthorizationData implements Serializable { this.audience = audience; } + public String getApplicationCertificate() { + return applicationCertificate; + } + + public void setApplicationCertificate(String applicationCertificate) { + this.applicationCertificate = applicationCertificate; + } + } http://git-wip-us.apache.org/repos/asf/cxf/blob/8cf96594/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java index 72ff6fb..461181e 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java @@ -196,6 +196,7 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService secData.setApplicationDescription(client.getApplicationDescription()); secData.setApplicationLogoUri(client.getApplicationLogoUri()); secData.setAudience(params.getFirst(OAuthConstants.CLIENT_AUDIENCE)); + secData.setApplicationName(client.getApplicationCertificate()); Map<String, String> extraProperties = client.getProperties(); secData.setExtraApplicationProperties(extraProperties); String replyTo = getMessageContext().getUriInfo()
