From 9e60da267563e4c7172fc978c238f7061a39a918 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Mon, 20 Aug 2012 12:22:38 -0400
Subject: [PATCH] added controls for client secret processing

---
 .../src/main/webapp/resources/js/app.js       | 17 +++++++++--
 .../webapp/resources/template/client.html     | 28 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/openid-connect-server/src/main/webapp/resources/js/app.js b/openid-connect-server/src/main/webapp/resources/js/app.js
index 7e4cbb5a0..e73a3ccf3 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/app.js
@@ -70,7 +70,10 @@
             clientId:"",
             allowRefresh:false,
             accessTokenValiditySeconds: 0,
-            refreshTokenValiditySeconds: 0
+            refreshTokenValiditySeconds: 0,
+            displayClientSecret: false,
+            generateClientSecret: false,
+            requireClientSecret: true
         },
 
         urlRoot:"api/clients"
@@ -205,10 +208,20 @@
                 }
             });
 
+            var requireClientSecret = $('#requireClientSecret').is(':checked');
+            var generateClientSecret = $('#generateClientSecret').is(':checked');
+            var clientSecret = null;
+            
+            if (requireClientSecret && !generateClientSecret) {
+            	// if it's required but we're not generating it, send the value
+            	clientSecret = $('#clientSecret input').val();
+            }
+
             var valid = this.model.set({
                 applicationName:$('#applicationName input').val(),
                 clientId:$('#clientId input').val(),
-                clientSecret:$('#clientSecret input').val(),
+                clientSecret: clientSecret,
+                generateClientSecret:generateClientSecret,
                 registeredRedirectUri:registeredRedirectUri,
                 clientDescription:$('#clientDescription textarea').val(),
                 allowRefresh:$('#allowRefresh').is(':checked'),
diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/client.html
index 319087f41..22d963fea 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -97,6 +97,34 @@
                 </div>
             </div>
 
+			<div class="control-group">
+				<label class="control-label">Require Client Secret</label>
+				<div class="controls">
+					<label class="checkbox">
+						<input type="checkbox" id="requireClientSecret" <%=(requireClientSecret == true ? 'checked' : '')%>> Require client secret?
+					</label>
+				</div>
+			</div>
+
+			<div class="control-group">
+				<label class="control-label">Generate Client Secret</label>
+				<div class="controls">
+					<label class="checkbox">
+						<input type="checkbox" id="generateClientSecret" <%=(generateClientSecret == true ? 'checked' : '')%>> Generate a new client secret?
+					</label>
+					<p class="help-block">New secret will be generated when you click 'Save'</p>
+				</div>
+			</div>
+
+			<div class="control-group">
+				<label class="control-label">Show Client Secret</label>
+				<div class="controls">
+					<label class="checkbox">
+						<input type="checkbox" id="displayClientSecret" <%=(displayClientSecret == true ? 'checked' : '')%>> Display client secret here:
+					</label>
+				</div>
+			</div>
+
             <div class="control-group" id="clientSecret">
                 <label class="control-label">Client Secret</label>
                 <div class="controls">