From f915196c2ea0d2ecf458d0316fb865f079c1e90b Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Mon, 13 Mar 2017 11:49:30 -0400
Subject: [PATCH] fix approval display

---
 .../src/main/webapp/WEB-INF/views/deviceApproved.jsp     | 9 ++++++++-
 .../src/main/webapp/WEB-INF/views/requestUserCode.jsp    | 8 ++++++--
 .../main/java/org/mitre/oauth2/web/DeviceEndpoint.java   | 8 ++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/deviceApproved.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/deviceApproved.jsp
index 1b588f12b..80f601c63 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/deviceApproved.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/deviceApproved.jsp
@@ -25,7 +25,14 @@
 			</c:choose>
 		</h1>
 
-		<div><spring:message code="${ approved ? 'device.approve.approved' : 'device.approve.notApproved' }" /></div>
+		<c:choose>
+			<c:when test="${ approved }">
+				<div class="text-success"><i class="icon-ok"></i> <spring:message code="device.approve.approved" /></div>
+			</c:when>
+			<c:otherwise>
+				<div class="text-error"><i class="icon-remove"></i> <spring:message code="device.approve.notApproved" /></div>
+			</c:otherwise>
+		</c:choose>
 
 	</div>
 </div>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/requestUserCode.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/requestUserCode.jsp
index 51292fff4..c629d0b9f 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/requestUserCode.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/requestUserCode.jsp
@@ -41,10 +41,14 @@
 
 		<form action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device-user/verify" method="POST">
 
-			<div class="row">
+			<div class="row-fluid">
 				<div class="span12">
 	                <spring:message code="device.request_code.submit" var="authorize_label"/>
-	                <input type="text" name="user_code" class="input-block-level" />
+	                <div>
+		                <div class="input-block-level input-xlarge">
+			                <input type="text" name="user_code" placeholder="code" autocorrect="off" autocapitalize="off" autocomplete="off" spellcheck="false" value="" />
+		                </div>
+	                </div>
 					<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 					<input name="approve" value="${authorize_label}" type="submit" class="btn btn-info btn-large" /> 
 				</div>
diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/web/DeviceEndpoint.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/DeviceEndpoint.java
index fcf6e7778..a794ff73b 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/DeviceEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/DeviceEndpoint.java
@@ -244,6 +244,10 @@ public class DeviceEndpoint {
 			return "requestUserCode";
 		}
 		
+		ClientDetailsEntity client = clientService.loadClientByClientId(dc.getClientId());
+		
+		model.put("client", client);
+		
 		// user did not approve
 		if (!approve) {
 			model.addAttribute("approved", false);
@@ -256,10 +260,6 @@ public class DeviceEndpoint {
 		
 		DeviceCode approvedCode = deviceCodeService.approveDeviceCode(dc, o2Auth);
 		
-		ClientDetailsEntity client = clientService.loadClientByClientId(dc.getClientId());
-		
-		model.put("client", client);
-		
 		// pre-process the scopes
 		Set<SystemScope> scopes = scopeService.fromStrings(dc.getScope());