Enable registration of a public-jwks-uri for every client

2 files changed, 22 insertions, 58 deletions

diff --git a/gn_auth/templates/admin/register-client.html b/gn_auth/templates/admin/register-client.html
index 5e24148..bfe56f8 100644
--- a/gn_auth/templates/admin/register-client.html
+++ b/gn_auth/templates/admin/register-client.html
@@ -84,6 +84,16 @@
     </select>
   </div>
 
+  <legend>Other metadata</legend>
+  <div class="form-group">
+    <label class="form-group" for="txt-client-jwk-uri">
+      Client's Public JWKs</label>
+    <input type="text"
+           id="txt-client-jwk-uri"
+           name="client_jwk_uri"
+           class="form-control" />
+  </div>
+
   <input type="submit" value="register client" class="btn btn-primary" />
 </form>
 {%endblock%}
diff --git a/gn_auth/templates/admin/view-oauth2-client.html b/gn_auth/templates/admin/view-oauth2-client.html
index 6da8291..c250ee3 100644
--- a/gn_auth/templates/admin/view-oauth2-client.html
+++ b/gn_auth/templates/admin/view-oauth2-client.html
@@ -73,68 +73,22 @@
                {%endif%} />
         {{granttype.name}}
       </label>
-
-  <input type="submit" class="btn btn-primary" value="update client" />
-</form>
-
-<hr />
-<h2>Signing/Verification SSL Keys</h2>
-<table>
-  <caption>Registered Public Keys</caption>
-  <thead>
-    <tr>
-      <th>JWK Thumbprint</th>
-      <th>Actions</th>
-    </tr>
-  </thead>
-
-  <tbody>
-    {%for sslkey in client.jwks.keys:%}
-    <tr>
-      <td>{{sslkey.thumbprint()}}</td>
-      <td>
-        <form method="POST"
-              action="{{url_for('oauth2.admin.delete_client_public_key')}}">
-          <input type="hidden"
-                 name="client_id"
-                 value="{{client.client_id}}" />
-          <input type="hidden"
-                 name="ssl_key"
-                 value="{{sslkey.thumbprint()}}" />
-          <input type="submit"
-                 class="btn btn-danger"
-                 value="delete key" />
-        </form>
-      </td>
-    </tr>
-    {%else%}
-    <tr>
-      <td class="alert-warning"
-          colspan="2">
-        There are no registered SSL keys for this client.
-      </td>
-    </tr>
     </div>
     {%endfor%}
-  </tbody>
-</table>
-<form id="frm-client-add-ssl-key"
-      method="POST"
-      action="{{url_for('oauth2.admin.register_client_public_key')}}">
-  <legend>Register new SSL key</legend>
-  <input type="hidden" name="client_id" value="{{client.client_id}}" />
-  <fieldset>
-    <label for="txt-area-client-ssl-key">Client's Public Key</label>
-    <textarea id="txt-area-client-ssl-key"
-              name="client_ssl_key"
-              required="required"
-              class="form-control"
-              rows="10"></textarea>
-  </fieldset>
   </div>
 
-  <br />
-  <input type="submit" class="btn btn-primary" value="register key" />
+  <legend>Other metadata</legend>
+  <div class="form-group">
+    <label class="form-group" for="txt-client-jwk-uri">
+      Client's Public JWKs</label>
+    <input type="text"
+           id="txt-client-jwk-uri"
+           name="client_jwk_uri"
+           class="form-control"
+           value="{{client.client_metadata.get('public-jwks-uri', '')}}" />
+  </div>
+
+  <input type="submit" class="btn btn-primary" value="update client" />
 </form>
 
 {%endif%}