You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/12/22 14:13:25 UTC
cxf git commit: Copying a client type property from
AccessTokenValidation to OAuth context
Repository: cxf
Updated Branches:
refs/heads/master 890fbf745 -> ce4bf27a5
Copying a client type property from AccessTokenValidation to OAuth context
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce4bf27a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce4bf27a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce4bf27a
Branch: refs/heads/master
Commit: ce4bf27a5ae1392eb6fd09c5dd6b3252fa5400aa
Parents: 890fbf7
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Mon Dec 22 13:12:55 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Mon Dec 22 13:12:55 2014 +0000
----------------------------------------------------------------------
.../apache/cxf/rs/security/oauth2/common/OAuthContext.java | 7 +++++++
.../cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 1 +
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce4bf27a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java
index a2f5384..492ca25 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java
@@ -33,6 +33,7 @@ public class OAuthContext {
private List<OAuthPermission> tokenPermissions;
private String tokenGrantType;
private String clientId;
+ private boolean isClientConfidential;
private String tokenKey;
private String tokenAudience;
private String[] tokenRequestParts;
@@ -127,4 +128,10 @@ public class OAuthContext {
public void setTokenRequestParts(String[] tokenRequestParts) {
this.tokenRequestParts = tokenRequestParts;
}
+ public boolean isClientConfidential() {
+ return isClientConfidential;
+ }
+ public void setClientConfidential(boolean isConfidential) {
+ this.isClientConfidential = isConfidential;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce4bf27a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
index a41292a..a94c2e4 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
@@ -130,6 +130,7 @@ public class OAuthRequestFilter extends AbstractAccessTokenValidator
accessTokenV.getTokenGrantType());
oauthContext.setClientId(accessTokenV.getClientId());
+ oauthContext.setClientConfidential(accessTokenV.isClientConfidential());
oauthContext.setTokenKey(accessTokenV.getTokenKey());
oauthContext.setTokenAudience(accessTokenV.getAudience());
oauthContext.setTokenRequestParts(authParts);