From 79dd8cb18953b039ac91fe43ee9fac906cd24d4b Mon Sep 17 00:00:00 2001
From: presidentio <presidentio>
Date: Sun, 2 Nov 2014 11:59:44 +0200
Subject: [PATCH] Custom token name in RemoteTokenServices

---
 .../provider/token/RemoteTokenServices.java    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/RemoteTokenServices.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/RemoteTokenServices.java
index 8ae7c9e62..4c1439e9d 100644
--- a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/RemoteTokenServices.java
+++ b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/RemoteTokenServices.java
@@ -12,10 +12,6 @@
  *******************************************************************************/
 package org.springframework.security.oauth2.provider.token;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Map;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpEntity;
@@ -35,6 +31,10 @@
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+
 /**
  * Queries the /check_token endpoint to obtain the contents of an access token.
  * 
@@ -56,6 +56,8 @@ public class RemoteTokenServices implements ResourceServerTokenServices {
 
 	private String clientSecret;
 
+    private String tokenName;
+
 	private AccessTokenConverter tokenConverter = new DefaultAccessTokenConverter();
 
 	public RemoteTokenServices() {
@@ -91,11 +93,15 @@ public void setAccessTokenConverter(AccessTokenConverter accessTokenConverter) {
 		this.tokenConverter = accessTokenConverter;
 	}
 
-	@Override
+    public void setTokenName(String tokenName) {
+        this.tokenName = tokenName;
+    }
+
+    @Override
 	public OAuth2Authentication loadAuthentication(String accessToken) throws AuthenticationException, InvalidTokenException {
 
 		MultiValueMap<String, String> formData = new LinkedMultiValueMap<String, String>();
-		formData.add("token", accessToken);
+		formData.add(tokenName, accessToken);
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("Authorization", getAuthorizationHeader(clientId, clientSecret));
 		Map<String, Object> map = postForMap(checkTokenEndpointUrl, formData, headers);