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 auth request variable

pull/604/head
Justin Richer 2014-05-13 09:26:27 -04:00
parent 7cd36b471f
commit fcfbf1080f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,12 +88,12 @@ public class OAuthConfirmationController {
@PreAuthorize("hasRole('ROLE_USER')") @PreAuthorize("hasRole('ROLE_USER')")
@RequestMapping("/oauth/confirm_access") @RequestMapping("/oauth/confirm_access")
public String confimAccess(Map<String, Object> model, @ModelAttribute("authorizationRequest") AuthorizationRequest clientAuth, public String confimAccess(Map<String, Object> model, @ModelAttribute("authorizationRequest") AuthorizationRequest authRequest,
Principal p) { Principal p) {
// Check the "prompt" parameter to see if we need to do special processing // Check the "prompt" parameter to see if we need to do special processing
String prompt = (String)clientAuth.getExtensions().get("prompt"); String prompt = (String)authRequest.getExtensions().get("prompt");
List<String> prompts = Splitter.on(" ").splitToList(Strings.nullToEmpty(prompt)); List<String> prompts = Splitter.on(" ").splitToList(Strings.nullToEmpty(prompt));
if (prompts.contains("none")) { if (prompts.contains("none")) {
// we're not supposed to prompt, so "return an error" // we're not supposed to prompt, so "return an error"
@ -107,7 +107,7 @@ public class OAuthConfirmationController {
ClientDetailsEntity client = null; ClientDetailsEntity client = null;
try { try {
client = clientService.loadClientByClientId(clientAuth.getClientId()); client = clientService.loadClientByClientId(authRequest.getClientId());
} catch (OAuth2Exception e) { } catch (OAuth2Exception e) {
logger.error("confirmAccess: OAuth2Exception was thrown when attempting to load client", e); logger.error("confirmAccess: OAuth2Exception was thrown when attempting to load client", e);
model.put("code", HttpStatus.BAD_REQUEST); model.put("code", HttpStatus.BAD_REQUEST);
@ -119,21 +119,21 @@ public class OAuthConfirmationController {
} }
if (client == null) { if (client == null) {
logger.error("confirmAccess: could not find client " + clientAuth.getClientId()); logger.error("confirmAccess: could not find client " + authRequest.getClientId());
model.put("code", HttpStatus.NOT_FOUND); model.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} }
model.put("auth_request", clientAuth); model.put("auth_request", authRequest);
model.put("client", client); model.put("client", client);
String redirect_uri = clientAuth.getRedirectUri(); String redirect_uri = authRequest.getRedirectUri();
model.put("redirect_uri", redirect_uri); model.put("redirect_uri", redirect_uri);
// pre-process the scopes // pre-process the scopes
Set<SystemScope> scopes = scopeService.fromStrings(clientAuth.getScope()); Set<SystemScope> scopes = scopeService.fromStrings(authRequest.getScope());
Set<SystemScope> sortedScopes = new LinkedHashSet<SystemScope>(scopes.size()); Set<SystemScope> sortedScopes = new LinkedHashSet<SystemScope>(scopes.size());
Set<SystemScope> systemScopes = scopeService.getAll(); Set<SystemScope> systemScopes = scopeService.getAll();