cxf git commit: Injecting MessageContext into ResourceOwner handler too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 06d2a32ad -> 963a541fe


Injecting MessageContext into ResourceOwner handler too


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/963a541f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/963a541f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/963a541f

Branch: refs/heads/3.1.x-fixes
Commit: 963a541fe53a4d3f0481472c75fe6b7310c929c7
Parents: 06d2a32
Author: Sergey Beryozkin 
Authored: Thu Mar 2 17:38:53 2017 +
Committer: Sergey Beryozkin 
Committed: Thu Mar 2 17:52:20 2017 +

--
 .../grants/owner/ResourceOwnerGrantHandler.java | 11 ++--
 .../provider/AbstractOAuthDataProvider.java |  8 ++
 .../oauth2/services/AbstractOAuthService.java   | 28 
 .../oauth2/services/AccessTokenService.java | 13 +++--
 .../security/oauth2/utils/OAuthConstants.java   |  1 +
 .../rs/security/oauth2/utils/OAuthUtils.java| 18 +
 6 files changed, 58 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/963a541f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
index 19e0f6b..4a5d03b 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.oauth2.grants.owner;
 
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.apache.cxf.jaxrs.ext.MessageContext;
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.OAuthError;
 import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
@@ -27,6 +28,7 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 import org.apache.cxf.rs.security.oauth2.grants.AbstractGrantHandler;
 import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
 import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
 
 /**
  * The "resource owner" grant handler
@@ -37,7 +39,7 @@ public class ResourceOwnerGrantHandler extends 
AbstractGrantHandler {
 public ResourceOwnerGrantHandler() {
 super(OAuthConstants.RESOURCE_OWNER_GRANT);
 }
-
+
 public ServerAccessToken createAccessToken(Client client, 
MultivaluedMap params)
 throws OAuthServiceException {
 
@@ -62,5 +64,10 @@ public class ResourceOwnerGrantHandler extends 
AbstractGrantHandler {
 this.loginHandler = loginHandler;
 }
 
-
+public void setMessageContext(MessageContext context) {
+if (loginHandler != null) {
+OAuthUtils.injectContextIntoOAuthProvider(context, loginHandler);
+}
+}
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/963a541f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index e39c9be..e5a8eba 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -25,6 +25,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.ws.rs.core.MultivaluedMap;
+
 import org.apache.cxf.jaxrs.ext.MessageContext;
 import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
 import org.apache.cxf.rs.security.jose.jwt.JwtToken;
@@ -311,6 +313,12 @@ public abstract class AbstractOAuthDataProvider implements 
OAuthDataProvider, Cl
 protected String getCurrentClientSecret() {
 return (String)messageContext.get(OAuthConstants.CLIENT_SECRET);
 }
+protected MultivaluedMap getCurrentRequestParams() {
+@SuppressWarnings("unchecked")
+

cxf git commit: Injecting MessageContext into ResourceOwner handler too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master afdf9361f -> 13d33c9ed


Injecting MessageContext into ResourceOwner handler too


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13d33c9e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13d33c9e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13d33c9e

Branch: refs/heads/master
Commit: 13d33c9ed261e06e44706cffa1671d67d31096a7
Parents: afdf936
Author: Sergey Beryozkin 
Authored: Thu Mar 2 17:38:53 2017 +
Committer: Sergey Beryozkin 
Committed: Thu Mar 2 17:38:53 2017 +

--
 .../grants/owner/ResourceOwnerGrantHandler.java | 11 ++--
 .../provider/AbstractOAuthDataProvider.java |  8 ++
 .../oauth2/services/AbstractOAuthService.java   | 28 
 .../oauth2/services/AccessTokenService.java | 11 +++-
 .../security/oauth2/utils/OAuthConstants.java   |  1 +
 .../rs/security/oauth2/utils/OAuthUtils.java| 18 +
 6 files changed, 57 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/13d33c9e/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
index ea39634..5aba67e 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrantHandler.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.oauth2.grants.owner;
 
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.apache.cxf.jaxrs.ext.MessageContext;
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.OAuthError;
 import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
@@ -27,6 +28,7 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 import org.apache.cxf.rs.security.oauth2.grants.AbstractGrantHandler;
 import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
 import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
 
 /**
  * The "resource owner" grant handler
@@ -37,7 +39,7 @@ public class ResourceOwnerGrantHandler extends 
AbstractGrantHandler {
 public ResourceOwnerGrantHandler() {
 super(OAuthConstants.RESOURCE_OWNER_GRANT);
 }
-
+
 public ServerAccessToken createAccessToken(Client client, 
MultivaluedMap params)
 throws OAuthServiceException {
 
@@ -62,5 +64,10 @@ public class ResourceOwnerGrantHandler extends 
AbstractGrantHandler {
 this.loginHandler = loginHandler;
 }
 
-
+public void setMessageContext(MessageContext context) {
+if (loginHandler != null) {
+OAuthUtils.injectContextIntoOAuthProvider(context, loginHandler);
+}
+}
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/13d33c9e/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index 298835e..95ab72f 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -25,6 +25,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.ws.rs.core.MultivaluedMap;
+
 import org.apache.cxf.jaxrs.ext.MessageContext;
 import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
 import org.apache.cxf.rs.security.jose.jwt.JwtToken;
@@ -306,6 +308,12 @@ public abstract class AbstractOAuthDataProvider implements 
OAuthDataProvider, Cl
 protected String getCurrentClientSecret() {
 return (String)messageContext.get(OAuthConstants.CLIENT_SECRET);
 }
+protected MultivaluedMap getCurrentRequestParams() {
+@SuppressWarnings("unchecked")
+MultivaluedMap