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

fix approval display

pull/1161/merge
Justin Richer 2017-03-13 11:49:30 -04:00
parent cbf5bf742b
commit f915196c2e
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openid-connect-server-webapp/src/main/webapp/WEB-INF/views/deviceApproved.jsp
View File

@ -25,7 +25,14 @@
</c:choose> </c:choose>
</h1> </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>
</div> </div>

8
openid-connect-server-webapp/src/main/webapp/WEB-INF/views/requestUserCode.jsp
View File

@ -41,10 +41,14 @@
<form action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device-user/verify" method="POST"> <form action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device-user/verify" method="POST">
<div class="row"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<spring:message code="device.request_code.submit" var="authorize_label"/> <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 type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
<input name="approve" value="${authorize_label}" type="submit" class="btn btn-info btn-large" /> <input name="approve" value="${authorize_label}" type="submit" class="btn btn-info btn-large" />
</div> </div>

8
openid-connect-server/src/main/java/org/mitre/oauth2/web/DeviceEndpoint.java
View File

@ -244,6 +244,10 @@ public class DeviceEndpoint {
return "requestUserCode"; return "requestUserCode";
} }
ClientDetailsEntity client = clientService.loadClientByClientId(dc.getClientId());
model.put("client", client);
// user did not approve // user did not approve
if (!approve) { if (!approve) {
model.addAttribute("approved", false); model.addAttribute("approved", false);
@ -256,10 +260,6 @@ public class DeviceEndpoint {
DeviceCode approvedCode = deviceCodeService.approveDeviceCode(dc, o2Auth); DeviceCode approvedCode = deviceCodeService.approveDeviceCode(dc, o2Auth);
ClientDetailsEntity client = clientService.loadClientByClientId(dc.getClientId());
model.put("client", client);
// pre-process the scopes // pre-process the scopes
Set<SystemScope> scopes = scopeService.fromStrings(dc.getScope()); Set<SystemScope> scopes = scopeService.fromStrings(dc.getScope());