Repository: cxf-fediz Updated Branches: refs/heads/master 1813605d1 -> 6842bcfc2
Minor JSP updates Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6842bcfc Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6842bcfc Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6842bcfc Branch: refs/heads/master Commit: 6842bcfc2e35d1e68f088456f0e15930ba6b72f4 Parents: 1813605 Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Thu Jan 14 14:23:05 2016 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Thu Jan 14 14:23:05 2016 +0000 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/views/client.jsp | 7 ++-- .../main/webapp/WEB-INF/views/clientTokens.jsp | 37 +++++++++++++++++--- .../webapp/WEB-INF/views/registeredClients.jsp | 10 +++--- 3 files changed, 42 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6842bcfc/services/oidc/src/main/webapp/WEB-INF/views/client.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp index fb9d4f9..95f7cb7 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp @@ -62,14 +62,15 @@ SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm", Locale.US); dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); %> - <tr><th>Identifier</th><th>Secret</th><th>Creation Date</th><th>Redirect URIs</th></tr> + <tr><th>ID</th><th>Secret</th><th>Creation Date</th><th>Redirect URI</th></tr> <tr> - <td><input type="text" name="clientId" size="15" readonly="readonly" value="<%= client.getClientId() %>" /></td> + <td> + <%= client.getClientId() %> <td> <% if (client.getClientSecret() != null) { %> - <input type="text" name="clientSecret" size="25" readonly="readonly" value="<%= client.getClientSecret() %>" /> + <%= client.getClientSecret() %> <% } else { %> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6842bcfc/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp index 47d96f4..8a74b22 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp @@ -46,17 +46,25 @@ <body> <h1>Tokens issued to <%= client.getApplicationName() + "(" + client.getClientId() + ")"%></h1> <br/> -<br/> <div class="padded"> <h2>Access Tokens</h2> <br/> <table border="1"> - <tr><th>Identifier</th><th>Issue Date</th><th>Expiry Date</th></tr> + <tr> + <th>ID</th><th>Issue Date</th><th>Expiry Date</th> + <% + if (!tokens.getRefreshTokens().isEmpty()) { + %> + <th>Refresh Token</th> + <% + } + %> + </tr> <% for (ServerAccessToken token : tokens.getAccessTokens()) { %> <tr> - <td><input type="text" name="tokenId" size="15" readonly="readonly" value="<%= token.getTokenKey() %>" /></td> + <td><input type="text" name="tokenId" readonly="readonly" value="<%= token.getTokenKey() %>" /></td> <td> <% Date issuedDate = new Date(token.getIssuedAt() * 1000); @@ -71,6 +79,15 @@ %> <%= expires %><br/> </td> + <% + if (token.getRefreshToken() != null) { + %> + <td> + <%= token.getRefreshToken() %> + <td> + <% + } + %> <td> <form action="/fediz-oidc/clients/<%= client.getClientId() + "/at/" + token.getTokenKey() + "/revoke"%>" method="POST"> <div data-type="control_button" class="form-line"> @@ -88,12 +105,12 @@ <h2>Refresh Tokens</h2> <br/> <table border="1"> - <tr><th>Identifier</th><th>Issue Date</th><th>Expiry Date</th></tr> + <tr><th>ID</th><th>Issue Date</th><th>Expiry Date</th><th>Access Token</th></tr> <% for (RefreshToken token : tokens.getRefreshTokens()) { %> <tr> - <td><input type="text" name="tokenId" size="15" readonly="readonly" value="<%= token.getTokenKey() %>" /></td> + <td><input type="text" name="tokenId" readonly="readonly" value="<%= token.getTokenKey() %>" /></td> <td> <% Date issuedDate = new Date(token.getIssuedAt() * 1000); @@ -109,6 +126,16 @@ <%= expires %><br/> </td> <td> + <% + for (String at : token.getAccessTokens()) { + %> + <%= at %><br/> + <% + } + %> + </td> + + <td> <form action="/fediz-oidc/clients/<%= client.getClientId() + "/rt/" + token.getTokenKey() + "/revoke"%>" method="POST"> <div data-type="control_button" class="form-line"> <button class="form-submit-button" type="submit">Delete</button> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6842bcfc/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp index ee1455c..6ddeca0 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp @@ -15,7 +15,7 @@ %> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>API Client Registration Confirmation</title> + <title>Registered Clients</title> <STYLE TYPE="text/css"> table { border-collapse: collapse; @@ -38,10 +38,10 @@ </head> <body> <div class="padded"> -<h1>Registered API Clients</h1> +<h1>Registered Clients</h1> <br/> <table border="1"> - <tr><th>Name</th><th>Identifier</th><th>Creation Date</th><th>Redirect URIs</th></tr> + <tr><th>Name</th><th>ID</th><th>Creation Date</th><th>Redirect URI</th></tr> <% SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM yyyy", Locale.US); dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); @@ -50,7 +50,9 @@ %> <tr> <td><a href="<%= basePath + "clients/" + client.getClientId() %>"><%= client.getApplicationName() %></a></td> - <td><input type="text" name="clientId" size="15" readonly="readonly" value="<%= client.getClientId() %>" /></td> + <td> + <%= client.getClientId() %> + </td> <td> <% Date date = new Date(client.getRegisteredAt() * 1000);