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/02/13 13:44:55 UTC
svn commit: r1567908 - in
/cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2:
filters/AccessTokenValidatorClient.java
services/AccessTokenValidatorService.java
Author: sergeyb
Date: Thu Feb 13 12:44:54 2014
New Revision: 1567908
URL: http://svn.apache.org/r1567908
Log:
[CXF-5561] More updates
Modified:
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenValidatorService.java
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java?rev=1567908&r1=1567907&r2=1567908&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java Thu Feb 13 12:44:54 2014
@@ -21,7 +21,7 @@ package org.apache.cxf.rs.security.oauth
import java.util.Collections;
import java.util.List;
-import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Form;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.MessageContext;
@@ -43,8 +43,8 @@ public class AccessTokenValidatorClient
String authSchemeData)
throws OAuthServiceException {
WebClient client = WebClient.fromClient(tokenValidatorClient, true);
- client.header(HttpHeaders.AUTHORIZATION, authScheme + " " + authSchemeData);
- return client.get(AccessTokenValidation.class);
+ Form form = new Form().param("authScheme", authScheme).param("authSchemeData", authSchemeData);
+ return client.post(form, AccessTokenValidation.class);
}
public void setTokenValidatorClient(WebClient tokenValidatorClient) {
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenValidatorService.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenValidatorService.java?rev=1567908&r1=1567907&r2=1567908&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenValidatorService.java (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenValidatorService.java Thu Feb 13 12:44:54 2014
@@ -18,9 +18,10 @@
*/
package org.apache.cxf.rs.security.oauth2.services;
+import javax.ws.rs.Consumes;
import javax.ws.rs.Encoded;
import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@@ -30,8 +31,9 @@ import org.apache.cxf.rs.security.oauth2
@Path("validate")
public class AccessTokenValidatorService extends AbstractAccessTokenValidator {
- @GET
+ @POST
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public AccessTokenValidation getTokenValidationInfo(@FormParam("authScheme") String authScheme,
@Encoded @FormParam("authScheme") String authSchemeData) {
if (getMessageContext().getSecurityContext().getUserPrincipal() == null) {