cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Copying a client type property from AccessTokenValidation to OAuth context
Date Mon, 22 Dec 2014 13:15:36 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 6a2f8cde2 -> 2b1f61d28


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/2b1f61d2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2b1f61d2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2b1f61d2

Branch: refs/heads/3.0.x-fixes
Commit: 2b1f61d28c800cd577bbaa4e5a1ded06a0727727
Parents: 6a2f8cd
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Mon Dec 22 13:12:55 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Mon Dec 22 13:15:19 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/2b1f61d2/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/2b1f61d2/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);


Mime
View raw message