Minor fix

tushar-97 · May 24, 2019 · 2210624 · 2210624
1 parent b89e9c7
commit 2210624
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ore/bindaas-core-impl/src/main/java/edu/emory/cci/bindaas/core/jwt/DefaultJWTManager.java b/...ore/bindaas-core-impl/src/main/java/edu/emory/cci/bindaas/core/jwt/DefaultJWTManager.java
@@ -26,6 +26,7 @@
 import edu.emory.cci.bindaas.security.api.BindaasUser;
 
 import java.util.Date;
+import java.util.List;
 
 
 public class DefaultJWTManager implements IJWTManager {
@@ -82,6 +83,7 @@ public Token generateJWT(BindaasUser bindaasUser , Date dateExpires, String init
 			UserRequest userRequest = new UserRequest();
 			userRequest.setStage(Stage.accepted);
 			userRequest.setJWT(jws);
+			userRequest.setDateExpires(dateExpires);
 
 			userRequest.setEmailAddress(emailAddress);
 			userRequest.setFirstName(firstName);

diff --git a/projects/core/bindaas-web-console/src/main/resources/META-INF/templates/administration.vt b/projects/core/bindaas-web-console/src/main/resources/META-INF/templates/administration.vt
@@ -168,12 +168,12 @@
 											<form>
 												<table>
 													<thead>
-														<th>Request Date</th><th>Expires On</th><th>First Name</th><th>Last Name</th><th>Email Address</th><th>API Key</th><th>Actions</th>
+														<th>Request Date</th><th>Expires On</th><th>First Name</th><th>Last Name</th><th>Email Address</th><th>Token</th><th>Actions</th>
 													</thead>
 													<tbody>
 														#foreach ($acceptedRequest in $acceptedRequests)
 														<tr>
-															<td>$acceptedRequest.getRequestDate().toString()</td><td>$acceptedRequest.getDateExpires()</td><td>$acceptedRequest.getFirstName()</td><td>$acceptedRequest.getLastName()</td><td>$acceptedRequest.getEmailAddress()</td><td>$acceptedRequest.getApiKey()</td><td>
+															<td>$acceptedRequest.getRequestDate().toString()</td><td>$acceptedRequest.getDateExpires()</td><td>$acceptedRequest.getFirstName()</td><td>$acceptedRequest.getLastName()</td><td>$acceptedRequest.getEmailAddress()</td><td>$acceptedRequest.getJWT()</td><td>
 															<div>
 																<a href="#" class="foundicon-minus" onclick="showCommentsExpirationDialog('revoke' , '$acceptedRequest.getId()')"> Revoke Access </a>
 															</div>