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 2015/11/24 15:17:06 UTC
cxf git commit: More updates to OAuthInvoker
Repository: cxf
Updated Branches:
refs/heads/master 3724268af -> 52e24f340
More updates to OAuthInvoker
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/52e24f34
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/52e24f34
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/52e24f34
Branch: refs/heads/master
Commit: 52e24f340f3350d5623c4503da4cedc2a60b3b18
Parents: 3724268
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Nov 24 14:16:50 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Nov 24 14:16:50 2015 +0000
----------------------------------------------------------------------
.../rs/security/oauth2/client/ClientCodeRequestFilter.java | 1 -
.../apache/cxf/rs/security/oauth2/client/OAuthInvoker.java | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/52e24f34/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index c54a992..ae54e99 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -195,7 +195,6 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter {
ClientTokenContext tokenContext = initializeClientTokenContext(rc, at, state);
if (at != null && clientTokenContextManager != null) {
clientTokenContextManager.setClientTokenContext(mc, tokenContext);
- JAXRSUtils.getCurrentMessage().setContent(ClientTokenContextManager.class, clientTokenContextManager);
}
setClientCodeRequest(tokenContext);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/52e24f34/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java
index 6775b4b..8bd49ab 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java
@@ -33,6 +33,7 @@ import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
public class OAuthInvoker extends JAXRSInvoker {
private WebClient accessTokenServiceClient;
+ private ClientTokenContextManager clientTokenContextManager;
private Consumer consumer;
@Override
protected Object performInvocation(Exchange exchange, final Object serviceObject, Method m,
@@ -49,11 +50,9 @@ public class OAuthInvoker extends JAXRSInvoker {
accessToken = OAuthClientUtils.refreshAccessToken(accessTokenServiceClient,
consumer,
accessToken);
- ClientTokenContextManager contextManager =
- exchange.getInMessage().getContent(ClientTokenContextManager.class);
MessageContext mc = new MessageContextImpl(inMessage);
((ClientTokenContextImpl)tokenContext).setToken(accessToken);
- contextManager.setClientTokenContext(mc, tokenContext);
+ clientTokenContextManager.setClientTokenContext(mc, tokenContext);
//retry
return super.performInvocation(exchange, serviceObject, m, paramArray);
@@ -71,4 +70,8 @@ public class OAuthInvoker extends JAXRSInvoker {
public void setConsumer(Consumer consumer) {
this.consumer = consumer;
}
+
+ public void setClientTokenContextManager(ClientTokenContextManager clientTokenContextManager) {
+ this.clientTokenContextManager = clientTokenContextManager;
+ }
}