Renamed OAuth2Request authorizatoinParameters map to requestParameters
parent
967b3f2953
commit
713f0a4d25
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 2751c94908f712e7cb71cef49db25363912ea8bf
|
||||
Subproject commit 36122b59df500822613db525efdd9b1031b43ab8
|
Loading…
Reference in New Issue