From fcfbf1080f80d1b95a791eff183df9267cf85104 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Tue, 13 May 2014 09:26:27 -0400
Subject: [PATCH] renamed auth request variable

---
 .../oauth2/web/OAuthConfirmationController.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 6bf0c6a4c..057ce1cad 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
@@ -88,12 +88,12 @@ public class OAuthConfirmationController {
 
 	@PreAuthorize("hasRole('ROLE_USER')")
 	@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) {
 
 		// 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));
 		if (prompts.contains("none")) {
 			// we're not supposed to prompt, so "return an error"
@@ -107,7 +107,7 @@ public class OAuthConfirmationController {
 		ClientDetailsEntity client = null;
 
 		try {
-			client = clientService.loadClientByClientId(clientAuth.getClientId());
+			client = clientService.loadClientByClientId(authRequest.getClientId());
 		} catch (OAuth2Exception e) {
 			logger.error("confirmAccess: OAuth2Exception was thrown when attempting to load client", e);
 			model.put("code", HttpStatus.BAD_REQUEST);
@@ -119,21 +119,21 @@ public class OAuthConfirmationController {
 		}
 
 		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);
 			return "httpCodeView";
 		}
 
-		model.put("auth_request", clientAuth);
+		model.put("auth_request", authRequest);
 		model.put("client", client);
 
-		String redirect_uri = clientAuth.getRedirectUri();
+		String redirect_uri = authRequest.getRedirectUri();
 
 		model.put("redirect_uri", redirect_uri);
 
 		
 		// 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> systemScopes = scopeService.getAll();