Author: sergeyb
Date: Mon Jan 23 12:03:29 2012
New Revision: 1234757
URL: http://svn.apache.org/viewvc?rev=1234757&view=rev
Log:
Merged revisions 1234756 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1234756 | sergeyb | 2012-01-23 12:01:48 +0000 (Mon, 23 Jan 2012) | 1 line
[CXF-4051] And making the AccessToken registration more flexible
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 23 12:03:29 2012
@@ -1 +1 @@
-/cxf/trunk:1234634,1234739
+/cxf/trunk:1234634,1234739,1234756
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java?rev=1234757&r1=1234756&r2=1234757&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
Mon Jan 23 12:03:29 2012
@@ -31,6 +31,7 @@ import net.oauth.OAuthProblemException;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.rs.security.oauth.data.AccessToken;
+import org.apache.cxf.rs.security.oauth.data.AccessTokenRegistration;
import org.apache.cxf.rs.security.oauth.data.Client;
import org.apache.cxf.rs.security.oauth.data.OAuthPermission;
import org.apache.cxf.rs.security.oauth.data.RequestToken;
@@ -116,8 +117,10 @@ public class MemoryOAuthDataProvider imp
return requestToken.getVerifier();
}
- public AccessToken createAccessToken(RequestToken requestToken) throws
- OAuthServiceException {
+ public AccessToken createAccessToken(AccessTokenRegistration reg) throws
+ OAuthServiceException {
+
+ RequestToken requestToken = reg.getRequestToken();
Client client = requestToken.getClient();
requestToken = getRequestToken(requestToken.getTokenKey());
Modified:
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java?rev=1234757&r1=1234756&r2=1234757&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java
Mon Jan 23 12:03:29 2012
@@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.rs.security.oauth.data.AccessToken;
+import org.apache.cxf.rs.security.oauth.data.AccessTokenRegistration;
import org.apache.cxf.rs.security.oauth.data.Client;
import org.apache.cxf.rs.security.oauth.data.OAuthPermission;
import org.apache.cxf.rs.security.oauth.data.RequestToken;
@@ -108,9 +109,11 @@ public class MemoryOAuthDataProvider imp
return requestToken.getVerifier();
}
- public AccessToken createAccessToken(RequestToken requestToken) throws
+ public AccessToken createAccessToken(AccessTokenRegistration reg) throws
OAuthServiceException {
+ RequestToken requestToken = reg.getRequestToken();
+
Client client = requestToken.getClient();
requestToken = getRequestToken(requestToken.getTokenKey());
Modified:
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java?rev=1234757&r1=1234756&r2=1234757&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java
Mon Jan 23 12:03:29 2012
@@ -20,6 +20,7 @@
package org.apache.cxf.rs.security.oauth.provider;
import org.apache.cxf.rs.security.oauth.data.AccessToken;
+import org.apache.cxf.rs.security.oauth.data.AccessTokenRegistration;
import org.apache.cxf.rs.security.oauth.data.Client;
import org.apache.cxf.rs.security.oauth.data.RequestToken;
import org.apache.cxf.rs.security.oauth.data.RequestTokenRegistration;
@@ -73,11 +74,12 @@ public interface OAuthDataProvider {
/**
* Creates a new {@link AccessToken}
- * @param requestToken the request token approved by the resource owner
+ * @param reg {@link AccessTokenRegistration} instance which captures
+ * a request token approved by the resource owner
* @return new AccessToken
* @throws OAuthServiceException
*/
- AccessToken createAccessToken(RequestToken requestToken) throws
OAuthServiceException;
+ AccessToken createAccessToken(AccessTokenRegistration reg) throws
OAuthServiceException;
/**
* Returns the {@link AccessToken}
Modified:
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java?rev=1234757&r1=1234756&r2=1234757&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
Mon Jan 23 12:03:29 2012
@@ -33,6 +33,7 @@ import net.oauth.OAuthProblemException;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.rs.security.oauth.data.AccessToken;
+import org.apache.cxf.rs.security.oauth.data.AccessTokenRegistration;
import org.apache.cxf.rs.security.oauth.data.RequestToken;
import org.apache.cxf.rs.security.oauth.provider.OAuthDataProvider;
import org.apache.cxf.rs.security.oauth.utils.OAuthConstants;
@@ -70,7 +71,9 @@ public class AccessTokenHandler {
OAuthUtils.validateMessage(oAuthMessage, requestToken.getClient(),
requestToken,
dataProvider);
- AccessToken accessToken =
dataProvider.createAccessToken(requestToken);
+ AccessTokenRegistration reg = new AccessTokenRegistration();
+ reg.setRequestToken(requestToken);
+ AccessToken accessToken = dataProvider.createAccessToken(reg);
//create response
Map<String, Object> responseParams = new HashMap<String, Object>();
