From 713f0a4d253caa6fa76c8f9e7524ff84538193c1 Mon Sep 17 00:00:00 2001 From: Amanda Anganes Date: Fri, 3 May 2013 17:07:04 -0400 Subject: [PATCH] Renamed OAuth2Request authorizatoinParameters map to requestParameters --- .../main/java/org/mitre/oauth2/token/ChainedTokenGranter.java | 2 +- .../java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java | 2 +- .../java/org/mitre/oauth2/web/OAuthConfirmationController.java | 2 +- .../org/mitre/openid/connect/token/ConnectTokenEnhancer.java | 2 +- .../java/org/mitre/openid/connect/web/UserInfoEndpoint.java | 2 +- spring-security-oauth | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java b/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java index 21be12b6a..08d62476f 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java @@ -50,7 +50,7 @@ public class ChainedTokenGranter extends AbstractTokenGranter { @Override protected OAuth2Authentication getOAuth2Authentication(OAuth2Request authorizationRequest) throws AuthenticationException, InvalidTokenException { // read and load up the existing token - String incomingTokenValue = authorizationRequest.getAuthorizationParameters().get("token"); + String incomingTokenValue = authorizationRequest.getRequestParameters().get("token"); OAuth2AccessTokenEntity incomingToken = tokenServices.readAccessToken(incomingTokenValue); // check for scoping in the request, can't up-scope with a chained request diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java b/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java index e69776d11..2c718aee7 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java @@ -57,7 +57,7 @@ public class JwtAssertionTokenGranter extends AbstractTokenGranter { @Override protected OAuth2AccessToken getAccessToken(OAuth2Request oAuthRequest) throws AuthenticationException, InvalidTokenException { // read and load up the existing token - String incomingTokenValue = oAuthRequest.getAuthorizationParameters().get("assertion"); + String incomingTokenValue = oAuthRequest.getRequestParameters().get("assertion"); OAuth2AccessTokenEntity incomingToken = tokenServices.readAccessToken(incomingTokenValue); ClientDetailsEntity client = incomingToken.getClient(); diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java index fd201330b..e176b39ca 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java @@ -95,7 +95,7 @@ public class OAuthConfirmationController { model.put("auth_request", clientAuth); model.put("client", client); - String redirect_uri = clientAuth.getAuthorizationParameters().get("redirect_uri"); + String redirect_uri = clientAuth.getRequestParameters().get("redirect_uri"); model.put("redirect_uri", redirect_uri); diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java index 181824e5f..7db97aff7 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java @@ -120,7 +120,7 @@ public class ConnectTokenEnhancer implements TokenEnhancer { idClaims.setAudience(Lists.newArrayList(clientId)); - String nonce = originalAuthRequest.getAuthorizationParameters().get("nonce"); + String nonce = originalAuthRequest.getRequestParameters().get("nonce"); if (!Strings.isNullOrEmpty(nonce)) { idClaims.setCustomClaim("nonce", nonce); } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java index 4a369bd3b..d05499654 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java @@ -99,7 +99,7 @@ public class UserInfoEndpoint { OAuth2Authentication authentication = (OAuth2Authentication)p; model.addAttribute("scope", authentication.getAuthorizationRequest().getScope()); - model.addAttribute("requestObject", authentication.getAuthorizationRequest().getAuthorizationParameters().get("request")); + model.addAttribute("requestObject", authentication.getAuthorizationRequest().getRequestParameters().get("request")); } model.addAttribute("userInfo", userInfo); diff --git a/spring-security-oauth b/spring-security-oauth index 2751c9490..36122b59d 160000 --- a/spring-security-oauth +++ b/spring-security-oauth @@ -1 +1 @@ -Subproject commit 2751c94908f712e7cb71cef49db25363912ea8bf +Subproject commit 36122b59df500822613db525efdd9b1031b43ab8