From 3f9f33f9a478a04a9118de3ccc57b4399afe0416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20J=C3=B6nsson?= <fjo@kth.se>
Date: Mon, 9 Feb 2015 16:37:11 +0100
Subject: [PATCH] Started working on credentials tab.

---
 .../src/main/webapp/resources/js/client.js    |  2 +-
 .../resources/js/locale/en/messages.json      | 13 ++-
 .../resources/js/locale/sv/messages.json      | 11 +++
 .../webapp/resources/template/client.html     | 79 ++++++++++---------
 4 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index 741cd43b9..913655d1d 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -354,7 +354,7 @@ var ClientView = Backbone.View.extend({
     deleteClient:function (e) {
     	e.preventDefault();
 
-        if (confirm("Are you sure sure you would like to delete this client?")) {
+        if (confirm($.t('client.client-table.confirm'))) {
             var _self = this;
 
             this.model.destroy({
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
index 38b6fcd02..2fe47c4c3 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
@@ -17,7 +17,9 @@
         "client-form": {
             "access": "Access",
             "allow-introspection": "Allow calls to the Introspection Endpoint?",
+            "authentication-method": "Token Endpoint Authentication Method",
             "authorization-code": "authorization code",
+            "client-credentials": "client credentials",
             "client-description": "Description",
             "client-description-help": "Human-readable text description",
             "client-description-placeholder": "Type a description",
@@ -27,12 +29,15 @@
             "client-name": "Client name",
             "client-name-help": "Human-readable application name",
             "client-name-placeholder": "Type something",
+            "client-secret": "Client Secret",
             "contacts": "Kontakter",
             "contacts-placeholder": "new contact",
-            "client-credentials": "client credentials",
             "credentials": "Credentials",
             "crypto": "Crypto",
+            "display-secret": "Display/edit client secret:",
             "edit": "Edit Client",
+            "generate-new-secret": "Generate a new client secret?",
+            "generate-new-secret-help": "New secret will be generated when you click 'Save'",
             "grant-types": "Grant Types",
             "home": "Home Page",
             "home-help": "URL for the client's home page, will be displayed to the user",
@@ -53,6 +58,11 @@
             "refresh": "refresh",
             "registered": "Registered at",
             "response-types": "Response Types",
+            "secret-asymmetric-jwt": "Asymmetrically-signed JWT assertion",
+            "secret-http": "Client Secret over HTTP Basic",
+            "secret-none": "No authentication",
+            "secret-post": "Client Secret over HTTP POST",
+            "secret-symmetric-jwt": "Client Secret via symmetrically-signed JWT assertion",
             "sector-identifier": "Sector Identifier URI",
             "subject-type": "Subject Type",
             "terms": "Terms of Service",
@@ -63,6 +73,7 @@
             "type-web": "Web"
         },
         "client-table": {
+            "confirm": "Are you sure sure you would like to delete this client?",
             "match": {
                 "contacts": "contacts",
                 "description": "description",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
index f1454c3d7..024604cbd 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
@@ -18,6 +18,7 @@
             "access": "Behörigheter",
             "allow-introspection": "Tillåt anrop till introspektionsfunktionen?",
             "authorization-code": "auktoriseringskod",
+            "authentication-method": "Autentiseringsmetod för att hämta ut nycklar (token endpoint)",
             "client-credentials": "klienthemligheter",
             "client-description": "Beskrivning",
             "client-description-help": "Läsbar och begriplig text som beskriver klienten",
@@ -29,11 +30,15 @@
             "client-name-help": "Läsbar och begripligt namn på klienten",
             "client-name-placeholder": "Skriv någonting",
             "client-password": "lösenord",
+            "client-secret": "Client Secret",
             "contacts": "Kontakter",
             "contacts-placeholder": "ny kontakt",
             "credentials": "Hemligheter",
             "crypto": "Krypto",
+            "display-secret": "Display/edit client secret:",
             "edit": "Ändra klient",
+            "generate-new-secret": "Generera en ny klienthemlighet?",
+            "generate-new-secret-help": "En ny hemlighet kommer att genereras när du klickar på 'Save'",
             "grant-types": "Grant-typer",
             "home": "Hemsida",
             "home-help": "Länk till tjänstens hemsida. Den kommer att visas på bekräftelsesidan.",
@@ -52,6 +57,11 @@
             "redirect-uris": "Omdirigieringslänkar",
             "refresh": "refresh",
             "registered": "Registrerad",
+            "secret-asymmetric-jwt": "Asymmetriskt signerad JWT assertion",
+            "secret-http": "Klienthemlighet över HTTP Basic",
+            "secret-none": "Ingen autentisering",
+            "secret-post": "Klienthemlighet över HTTP POST",
+            "secret-symmetric-jwt": "Klienthemlighet via symmetriskt signerad JWT assertion",
             "sector-identifier": "Sector Identifier-länk",
             "sector-identifier-help": "Sector Identifier för JavaScript.",
             "subject-type": "Subjekttyp",
@@ -63,6 +73,7 @@
             "type-web": "Webb"
         },
         "client-table": {
+            "confirm": "Är du säker på att du vill ta bort denna klient?",
             "match": {
                 "contacts": "kontakter",
                 "description": "beskrivning",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
index d9d65b1e8..a70b9d673 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
@@ -184,7 +184,7 @@
 					<li class="active"><a data-target="#client-main-tab" data-toggle="tab" href="#" data-i18n="client.client-form.main">Main</a></li>
 					<li><a data-target="#client-access-tab" data-toggle="tab" href="#" data-i18n="client.client-form.access">Access</a></li>
 					<li><a data-target="#client-secret-tab" data-toggle="tab" href="#" data-i18n="client.client-form.credentials">Credentials</a></li>
-					<li><a data-target="#client-token-tab" data-toggle="tab" href="#" data-i18n="client.client-form.main">Tokens</a></li>
+					<li><a data-target="#client-token-tab" data-toggle="tab" href="#" data-i18n="client.client-form.tokens">Tokens</a></li>
 					<li><a data-target="#client-crypto-tab" data-toggle="tab" href="#" data-i18n="client.client-form.crypto">Crypto</a></li>
 					<li><a data-target="#client-other-tab" data-toggle="tab" href="#" data-i18n="client.client-form.other">Other</a></li>
 				</ul>
@@ -343,31 +343,31 @@
 				<div class="controls">
                     <div>
                         <input id="responseTypes-code" type="checkbox" <%-($.inArray("code", responseTypes) > -1 ? 'checked' : '')%>>
-                        <label class="checkbox">code</label>
+                        <label for="responseTypes-code" class="checkbox">code</label>
                     </div>
                     <div>
                         <input id="responseTypes-token" type="checkbox" <%-($.inArray("token", responseTypes) > -1 ? 'checked' : '')%>>
-                        <label class="checkbox">token</label>
+                        <label for="responseTypes-token" class="checkbox">token</label>
                     </div>
                     <div>
                         <input id="responseTypes-idtoken" type="checkbox" <%-($.inArray("id_token", responseTypes) > -1 ? 'checked' : '')%>>
-                        <label class="checkbox">id_token</label>
+                        <label for="responseTypes-idtoken" class="checkbox">id_token</label>
                     </div>
                     <div>
                         <input id="responseTypes-token-idtoken" type="checkbox" <%-($.inArray("token id_token", responseTypes) > -1 ? 'checked' : '')%>>
-                        <label class="checkbox">token id_token</label>
+                        <label for="responseTypes-token-idtoken" class="checkbox">token id_token</label>
                     </div>
                     <div>
                         <input id="responseTypes-code-idtoken" type="checkbox" <%-($.inArray("code id_token", responseTypes) > -1 ? 'checked' : '')%>>
-                        <label class="checkbox">code id_token</label>
+                        <label for="responseTypes-code-idtoken" class="checkbox">code id_token</label>
                     </div>
                     <div>
                         <input id="responseTypes-code-token" type="checkbox" <%-($.inArray("code token", responseTypes) > -1 ? 'checked' : '')%>>
-                        <label class="checkbox">code token</label>
+                        <label for="responseTypes-code-token" class="checkbox">code token</label>
                     </div>
                     <div>
                         <input id="responseTypes-code-token-idtoken" type="checkbox" <%-($.inArray("code token id_token", responseTypes) > -1 ? 'checked' : '')%>>
-                        <label class="checkbox">code token id_token</label>
+                        <label for="responseTypes-code-token-idtoken" class="checkbox">code token id_token</label>
                     </div>
 				</div>
 			</div>
@@ -386,10 +386,10 @@
 				<label class="control-label" data-i18n="client.client-form.subject-type">Subject Type</label>
 				<div class="controls">
                     <div>
-                        <input type="radio" name="subjectType" value="PUBLIC" <%-(subjectType == 'PUBLIC' ? 'checked' : '')%>>
-                        <label class="radio inline" data-i18n="client.client-form.public">Public</label>
-                        <input type="radio" name="subjectType" value="PAIRWISE" <%-(subjectType == 'PAIRWISE' ? 'checked' : '')%>>
-                        <label class="radio inline" data-i18n="client.client-form.pairwise">Pairwise</label>
+                        <input id="control-label-public" type="radio" name="subjectType" value="PUBLIC" <%-(subjectType == 'PUBLIC' ? 'checked' : '')%>>
+                        <label for="control-label-public" class="radio inline" data-i18n="client.client-form.public">Public</label>
+                        <input id="control-label-pairwise" type="radio" name="subjectType" value="PAIRWISE" <%-(subjectType == 'PAIRWISE' ? 'checked' : '')%>>
+                        <label for="control-label-pairwise" class="radio inline" data-i18n="client.client-form.pairwise">Pairwise</label>
                     </div>
 				</div>
 			</div>
@@ -407,43 +407,50 @@
 	<div class="tab-pane" id="client-secret-tab">
 
 			<div class="control-group" id="tokenEndpointAuthMethod">
-				<label class="control-label">Token Endpoint Authentication Method</label>
+				<label class="control-label" data-i18n="client.client-form.authentication-method">Token Endpoint Authentication Method</label>
 				<div class="controls">
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="SECRET_BASIC" <%-(tokenEndpointAuthMethod == 'SECRET_BASIC' ? 'checked' : '')%>> Client Secret over HTTP Basic
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="SECRET_POST" <%-(tokenEndpointAuthMethod == 'SECRET_POST' ? 'checked' : '')%>> Client Secret over HTTP POST
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="SECRET_JWT" <%-(tokenEndpointAuthMethod == 'SECRET_JWT' ? 'checked' : '')%>> Client Secret via symmetrically-signed JWT assertion
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="PRIVATE_KEY" <%-(tokenEndpointAuthMethod == 'PRIVATE_KEY' ? 'checked' : '')%>> Asymmetrically-signed JWT assertion
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="NONE" <%-(tokenEndpointAuthMethod == 'NONE' ? 'checked' : '')%>> No authentication
-					</label>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodBasic" name="tokenEndpointAuthMethod" value="SECRET_BASIC" <%-(tokenEndpointAuthMethod == 'SECRET_BASIC' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodBasic" class="radio" data-i18n="client.client-form.secret-http">Client Secret over HTTP Basic</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodPost" name="tokenEndpointAuthMethod" value="SECRET_POST" <%-(tokenEndpointAuthMethod == 'SECRET_POST' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodPost" class="radio" data-i18n="client.client-form.secret-post">Client Secret over HTTP POST</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodSymm" name="tokenEndpointAuthMethod" value="SECRET_JWT" <%-(tokenEndpointAuthMethod == 'SECRET_JWT' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodSymm" class="radio" data-i18n="client.client-form.secret-symmetric-jwt">Client Secret via symmetrically-signed JWT assertion</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodAssym" name="tokenEndpointAuthMethod" value="PRIVATE_KEY" <%-(tokenEndpointAuthMethod == 'PRIVATE_KEY' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodAssym" class="radio" data-i18n="client.client-form.secret-asymmetric-jwt">Asymmetrically-signed JWT assertion</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodNone" name="tokenEndpointAuthMethod" value="NONE" <%-(tokenEndpointAuthMethod == 'NONE' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodNone" class="radio" data-i18n="client.client-form.secret-none">No authentication</label>
+                    </div>
 				</div>
 			</div>
 
 			<div id="clientSecretPanel">
-				<label class="control-label">Client Secret</label>
+				<label class="control-label" data-i18n="client.client-form.client-secret">Client Secret</label>
 
 				<div class="control-group" id="generateClientSecret">
 					<div class="controls">
-						<label class="checkbox">
-							<input type="checkbox" <%-(generateClientSecret == true ? 'checked' : '')%>> Generate a new client secret?
-						</label>
-						<p class="help-block">New secret will be generated when you click 'Save'</p>
+                        <div>
+                            <input id="clientSecretPanelInput" type="checkbox" <%-(generateClientSecret == true ? 'checked' : '')%>>
+                            <label for="clientSecretPanelInput" class="checkbox" data-i18n="client.client-form.generate-new-secret">Generate a new client secret?</label>
+                        </div>
+						<p class="help-block" data-i18n="client.client-form.generate-new-secret-help">New secret will be generated when you click 'Save'</p>
 					</div>
 				</div>
 	
 				<div class="control-group" id="displayClientSecret">
 					<div class="controls">
-						<label class="checkbox">
-							<input type="checkbox" <%-(displayClientSecret == true ? 'checked' : '')%>> Display/edit client secret:
-						</label>
+                        <div>
+                            <label id="displayClientSecretInput" class="checkbox" data-i18n="client.client-form.display-secret">Display/edit client secret:</label>
+                            <input for="displayClientSecretInput" type="checkbox" <%-(displayClientSecret == true ? 'checked' : '')%>>
+                        </div>
 					</div>
 				</div>