github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed OAuth2Request authorizatoinParameters map to requestParameters

pull/340/head
Amanda Anganes 2013-05-03 17:07:04 -04:00
parent 967b3f2953
commit 713f0a4d25
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java
View File

@ -50,7 +50,7 @@ public class ChainedTokenGranter extends AbstractTokenGranter {
@Override @Override
protected OAuth2Authentication getOAuth2Authentication(OAuth2Request authorizationRequest) throws AuthenticationException, InvalidTokenException { protected OAuth2Authentication getOAuth2Authentication(OAuth2Request authorizationRequest) throws AuthenticationException, InvalidTokenException {
// read and load up the existing token // read and load up the existing token
String incomingTokenValue = authorizationRequest.getAuthorizationParameters().get("token"); String incomingTokenValue = authorizationRequest.getRequestParameters().get("token");
OAuth2AccessTokenEntity incomingToken = tokenServices.readAccessToken(incomingTokenValue); OAuth2AccessTokenEntity incomingToken = tokenServices.readAccessToken(incomingTokenValue);
// check for scoping in the request, can't up-scope with a chained request // check for scoping in the request, can't up-scope with a chained request

2
openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java
View File

@ -57,7 +57,7 @@ public class JwtAssertionTokenGranter extends AbstractTokenGranter {
@Override @Override
protected OAuth2AccessToken getAccessToken(OAuth2Request oAuthRequest) throws AuthenticationException, InvalidTokenException { protected OAuth2AccessToken getAccessToken(OAuth2Request oAuthRequest) throws AuthenticationException, InvalidTokenException {
// read and load up the existing token // read and load up the existing token
String incomingTokenValue = oAuthRequest.getAuthorizationParameters().get("assertion"); String incomingTokenValue = oAuthRequest.getRequestParameters().get("assertion");
OAuth2AccessTokenEntity incomingToken = tokenServices.readAccessToken(incomingTokenValue); OAuth2AccessTokenEntity incomingToken = tokenServices.readAccessToken(incomingTokenValue);
ClientDetailsEntity client = incomingToken.getClient(); ClientDetailsEntity client = incomingToken.getClient();

2
openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java
View File

@ -95,7 +95,7 @@ public class OAuthConfirmationController {
model.put("auth_request", clientAuth); model.put("auth_request", clientAuth);
model.put("client", client); 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); model.put("redirect_uri", redirect_uri);

2
openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
View File

@ -120,7 +120,7 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
idClaims.setAudience(Lists.newArrayList(clientId)); idClaims.setAudience(Lists.newArrayList(clientId));
String nonce = originalAuthRequest.getAuthorizationParameters().get("nonce"); String nonce = originalAuthRequest.getRequestParameters().get("nonce");
if (!Strings.isNullOrEmpty(nonce)) { if (!Strings.isNullOrEmpty(nonce)) {
idClaims.setCustomClaim("nonce", nonce); idClaims.setCustomClaim("nonce", nonce);
} }

2
openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
View File

@ -99,7 +99,7 @@ public class UserInfoEndpoint {
OAuth2Authentication authentication = (OAuth2Authentication)p; OAuth2Authentication authentication = (OAuth2Authentication)p;
model.addAttribute("scope", authentication.getAuthorizationRequest().getScope()); 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); model.addAttribute("userInfo", userInfo);

2
spring-security-oauth

@ -1 +1 @@
Subproject commit 2751c94908f712e7cb71cef49db25363912ea8bf Subproject commit 36122b59df500822613db525efdd9b1031b43ab8