From 85e13bd11d6c1f347426c866bb5ad2452519ec9a Mon Sep 17 00:00:00 2001
From: Michael Jett <mjett@mitre.org>
Date: Tue, 28 Aug 2012 15:59:03 -0400
Subject: [PATCH] Initial Scope UI updates

---
 .../src/main/webapp/resources/js/app.js       | 46 +++++++++++++++----
 .../webapp/resources/template/client.html     |  5 +-
 2 files changed, 37 insertions(+), 14 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 f63a611cc..bf6ae096d 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/app.js
@@ -6,7 +6,7 @@
             var expression = /^(?:([a-z0-9+.-]+:\/\/)((?:(?:[a-z0-9-._~!$&'()*+,;=:]|%[0-9A-F]{2})*)@)?((?:[a-z0-9-._~!$&'()*+,;=]|%[0-9A-F]{2})*)(:(?:\d*))?(\/(?:[a-z0-9-._~!$&'()*+,;=:@\/]|%[0-9A-F]{2})*)?|([a-z0-9+.-]+:)(\/?(?:[a-z0-9-._~!$&'()*+,;=:@]|%[0-9A-F]{2})+(?:[a-z0-9-._~!$&'()*+,;=:@\/]|%[0-9A-F]{2})*)?)(\?(?:[a-z0-9-._~!$&'()*+,;=:\/?@]|%[0-9A-F]{2})*)?(#(?:[a-z0-9-._~!$&'()*+,;=:\/?@]|%[0-9A-F]{2})*)?$/i;
             var regex = new RegExp(expression);
 
-            if (!this.get("uri").match(regex)) {
+            if (!this.get("item").match(regex)) {
                 return "Invalid URI";
             }
         }
@@ -14,6 +14,16 @@
     });
 
 
+    /*
+    * Backbone JS Reusable ListWidget
+    *  Options
+    * {
+    *   collection: Backbone JS Collection
+    *   type: ('uri'|'default')
+    *   autocomplete: ['item1','item2'] List of auto complete items
+    * }
+    *
+     */
     var ListWidgetView = Backbone.View.extend({
 
         tagName: "table",
@@ -42,8 +52,8 @@
             render:function () {
                 this.$el.html(this.template(this.model.toJSON()));
 
-                if (this.model.get('uri').length > 27)
-                    this.$el.tooltip({title:this.model.get('uri')});
+                if (this.model.get('item').length > 27)
+                    this.$el.tooltip({title:this.model.get('item')});
 
                 return this;
             }
@@ -67,11 +77,18 @@
         addItem:function() {
             var input_value = $("input", this.el).val().trim();
 
-            var uri = new URIModel({uri:input_value});
+            var model;
+
+            if (this.options.type == 'uri') {
+                model = new URIModel({item:input_value});
+            } else {
+                model = new Backbone.Model({item:input_value});
+                model.validate = function() {};
+            }
 
             // if it's valid and doesn't already exist
-            if (uri.isValid() && this.collection.where({uri: input_value}).length < 1) {
-                this.collection.add(uri);
+            if (model.isValid() && this.collection.where({item: input_value}).length < 1) {
+                this.collection.add(model);
             }
         },
 
@@ -301,6 +318,7 @@
             }
 
             this.registeredRedirectUriCollection = new Backbone.Collection();
+            this.scopeCollection = new Backbone.Collection();
         },
 
         events:{
@@ -392,14 +410,14 @@
                 clientId:$('#clientId input').val(),
                 clientSecret: clientSecret,
                 generateClientSecret:generateClientSecret,
-                registeredRedirectUri: this.registeredRedirectUriCollection.pluck("uri"),
+                registeredRedirectUri: this.registeredRedirectUriCollection.pluck("item"),
                 clientDescription:$('#clientDescription textarea').val(),
                 allowRefresh:$('#allowRefresh').is(':checked'),
                 authorizedGrantTypes: authorizedGrantTypes,
                 accessTokenValiditySeconds: $('#accessTokenValiditySeconds input').val(),
                 refreshTokenValiditySeconds: $('#refreshTokenValiditySeconds input').val(),
                 idTokenValiditySeconds: $('#idTokenValiditySeconds input').val(),
-                scope:$.map($('#scope textarea').val().replace(/,$/,'').replace(/\s/g,' ').split(","), $.trim)
+                scope: this.scopeCollection.pluck("item")
             });
 
             if (valid) {
@@ -427,10 +445,18 @@
 
             // build and bind registered redirect URI collection and view
             _.each(this.model.get("registeredRedirectUri"), function (registeredRedirectUri) {
-                _self.registeredRedirectUriCollection.add(new URIModel({uri:registeredRedirectUri}));
+                _self.registeredRedirectUriCollection.add(new URIModel({item:registeredRedirectUri}));
             });
 
-            $("#registeredRedirectUri .controls",this.el).html(new ListWidgetView({collection: this.registeredRedirectUriCollection}).render().el);
+            $("#registeredRedirectUri .controls",this.el).html(new ListWidgetView({type:'uri', collection: this.registeredRedirectUriCollection}).render().el);
+
+            _self = this;
+            // build and bind scopes
+            _.each(this.model.get("scope"), function (scope) {
+                _self.scopeCollection.add(new Backbone.Model({item:scope}));
+            });
+
+            $("#scope .controls",this.el).html(new ListWidgetView({collection: this.scopeCollection}).render().el);
 
             return this;
         },
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 8d5f574a5..6dd00c5a1 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -94,9 +94,6 @@
             <div class="control-group" id="scope">
                 <label class="control-label">Scope</label>
                 <div class="controls">
-                    <textarea rows="3" class="xlarge" placeholder="openid"
-                              id="textarea2" name="textarea2"><% for (var i in scope) { %><%=scope[i]+","%><% }%></textarea>
-                    <p class="help-block">Please enter scopes separated by commas</p>
                 </div>
             </div>
 
@@ -221,7 +218,7 @@
 </script>
 
 <script type="text/html" id="tmpl-list-widget-child">
-    <td><%=(uri.length > 27) ? uri.substr(0,27) + '...' : uri %></td>
+    <td><%=(item.length > 27) ? item.substr(0,27) + '...' : item %></td>
     <td><i class="icon-minus-sign icon-gray"></i></td>
 </script>