Skip to content

Commit 82f1ba6

Browse files
jricherjricher
committed
cleaned out some global variables
1 parent ff4c0ab commit 82f1ba6

File tree

7 files changed

+59
-37
lines changed

7 files changed

+59
-37
lines changed

‎openid-connect-server-webapp/src/main/webapp/resources/js/admin.js‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -386,33 +386,44 @@ var AppRouter = Backbone.Router.extend({
386386
this.clientStats = new StatsModel();
387387
this.accessTokensList = new AccessTokenCollection();
388388
this.refreshTokensList = new RefreshTokenCollection();
389-
390389

391-
this.clientListView = new ClientListView({model:this.clientList, stats: this.clientStats});
392-
this.whiteListListView = new WhiteListListView({model:this.whiteListList});
393-
this.approvedSiteListView = new ApprovedSiteListView({model:this.approvedSiteList});
390+
this.clientListView = new ClientListView({model:this.clientList, stats: this.clientStats, systemScopeList: this.systemScopeList, whiteListList: this.whiteListList});
391+
this.whiteListListView = new WhiteListListView({model:this.whiteListList, clientList: this.clientList, systemScopeList: this.systemScopeList});
392+
this.approvedSiteListView = new ApprovedSiteListView({model:this.approvedSiteList, clientList: this.clientList, systemScopeList: this.systemScopeList});
394393
this.blackListListView = new BlackListListView({model:this.blackListList});
395394
this.systemScopeListView = new SystemScopeListView({model:this.systemScopeList});
396-
this.tokensListView = new TokenListView({model: {access: this.accessTokensList, refresh: this.refreshTokensList}});
395+
this.tokensListView = new TokenListView({model: {access: this.accessTokensList, refresh: this.refreshTokensList}, clientList: this.clientList, systemScopeList: this.systemScopeList});
396+
this.dynRegRootView = new DynRegRootView({systemScopeList: this.systemScopeList});
397397

398398
this.breadCrumbView = new BreadCrumbView({
399399
collection:new Backbone.Collection()
400400
});
401401

402402
this.breadCrumbView.render();
403403

404+
// set up loading dependencies
405+
406+
/*
407+
this.clientListView.dependsOn = [this.systemScopeList];
408+
this.whiteListListView.dependsOn = [this.whiteListList, this.clientList];
409+
this.accessTokensListView.dependsOn = [this.clientList];
410+
this.refreshTokenListView.dependsOn = [this.clientList];
411+
*/
412+
404413

405414
//
406415
// Several items depend on the clients and whitelists being loaded, so we're going to pre-fetch them here
407416
// and not start the app router until they're loaded.
408417
//
409418

410419
// load things in the right order:
420+
411421
$("#loading").html("server configuration");
412422
var base = $('base').attr('href');
413423
$.getJSON(base + '.well-known/openid-configuration', function(data) {
414424
app.serverConfiguration = data;
415-
$("#content .progress .bar").css("width", "20%");
425+
/**/
426+
$("#content .progress .bar").css("width", "20%");
416427
$("#loading").html("scopes");
417428
app.systemScopeList.fetch({
418429
success: function(collection, response) {
@@ -428,10 +439,12 @@ var AppRouter = Backbone.Router.extend({
428439
$("#loading").html("statistics");
429440
app.clientStats.fetch({
430441
success: function(model, response) {
442+
/**/
431443
$("#content .progress .bar").css("width", "100%");
432444
$("#loading").html("console");
433445
var baseUrl = $.url(app.serverConfiguration.issuer);
434446
Backbone.history.start({pushState: true, root: baseUrl.attr('relative') + 'manage/'});
447+
/**/
435448
}
436449
});
437450
}
@@ -440,6 +453,7 @@ var AppRouter = Backbone.Router.extend({
440453
});
441454
}
442455
});
456+
/**/
443457
});
444458

445459
},
@@ -489,7 +503,7 @@ var AppRouter = Backbone.Router.extend({
489503
idTokenValiditySeconds:600
490504
}, { silent: true });
491505

492-
this.clientFormView = new ClientFormView({model:client});
506+
this.clientFormView = new ClientFormView({model:client, systemScopeList: this.systemScopeList});
493507
$('#content').html(this.clientFormView.render().el);
494508
setPageTitle("New Client");
495509
},
@@ -527,7 +541,7 @@ var AppRouter = Backbone.Router.extend({
527541
displayClientSecret:false
528542
}, { silent: true });
529543

530-
this.clientFormView = new ClientFormView({model:client});
544+
this.clientFormView = new ClientFormView({model:client, systemScopeList: this.systemScopeList});
531545
$('#content').html(this.clientFormView.render().el);
532546

533547
setPageTitle("Edit Client");
@@ -577,7 +591,7 @@ var AppRouter = Backbone.Router.extend({
577591
allowedScopes: client.get('scope')
578592
}, { silent: true });
579593

580-
this.whiteListFormView = new WhiteListFormView({model: whiteList, client: client});
594+
this.whiteListFormView = new WhiteListFormView({model: whiteList, client: client, systemScopeList: this.systemScopeList});
581595
$('#content').html(this.whiteListFormView.render().el);
582596
setPageTitle("Create New Whitelist");
583597
} else {
@@ -607,7 +621,7 @@ var AppRouter = Backbone.Router.extend({
607621

608622
// if there's no client, this is an error
609623
if (client != null) {
610-
this.whiteListFormView = new WhiteListFormView({model: whiteList, client: client});
624+
this.whiteListFormView = new WhiteListFormView({model: whiteList, client: client, systemScopeList: this.systemScopeList});
611625
$('#content').html(this.whiteListFormView.render().el);
612626
setPageTitle("Edit Whitelist");
613627

@@ -760,7 +774,6 @@ var AppRouter = Backbone.Router.extend({
760774
{text:"Client Registration", href:"manage/#dev/dynreg"}
761775
]);
762776

763-
this.dynRegRootView = new DynRegRootView();
764777
$('#content').html(this.dynRegRootView.render().el);
765778

766779
setPageTitle("Self-service Client Registration");

‎openid-connect-server-webapp/src/main/webapp/resources/js/client.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ var ClientView = Backbone.View.extend({
135135
},
136136

137137
render:function (eventName) {
138-
var json = {client: this.model.toJSON(), count: this.options.count};
138+
var json = {client: this.model.toJSON(), count: this.options.count, whiteList: this.options.whiteList};
139139
this.$el.html(this.template(json));
140140

141-
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('scope'), systemScopes: app.systemScopeList}));
141+
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('scope'), systemScopes: this.options.systemScopeList}));
142142

143143
this.$('.dynamically-registered').tooltip({title: 'This client was dynamically registered'});
144144

@@ -157,8 +157,7 @@ var ClientView = Backbone.View.extend({
157157
},
158158

159159
whiteListClient:function() {
160-
var whiteList = app.whiteListList.getByClientId(this.model.get('clientId'));
161-
if (whiteList == null) {
160+
if (this.options.whiteList == null) {
162161
// create a new one
163162
app.navigate('admin/whitelist/new/' + this.model.id, {trigger: true});
164163
} else {
@@ -246,11 +245,15 @@ var ClientListView = Backbone.View.extend({
246245
// append and render table structure
247246
$(this.el).html($('#tmpl-client-table').html());
248247

249-
_.each(this.model.models, function (client) {
248+
var whiteList = this.options.whiteListList.getByClientId(this.model.get('clientId'));
249+
250+
_.each(this.model.models, function (client) {
250251
$("#client-table",this.el).append(
251252
new ClientView({
252253
model:client,
253-
count:this.options.stats.get(client.get('id'))
254+
count:this.options.stats.get(client.get('id')),
255+
systemScopeList: this.options.systemScopeList,
256+
whiteList: this.options.whiteListList.getByClientId(client.get('clientId'))
254257
}).render().el);
255258
}, this);
256259

@@ -637,7 +640,7 @@ var ClientFormView = Backbone.View.extend({
637640

638641
$("#scope .controls",this.el).html(new ListWidgetView({
639642
placeholder: 'new scope',
640-
autocomplete: _.uniq(_.flatten(app.systemScopeList.pluck("value"))),
643+
autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))),
641644
collection: this.scopeCollection}).render().el);
642645

643646
// build and bind contacts

‎openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var DynRegRootView = Backbone.View.extend({
9696

9797
client.fetch({success: function() {
9898

99-
var dynRegEditView = new DynRegEditView({model: client});
99+
var dynRegEditView = new DynRegEditView({model: client, systemScopeList: this.systemScopeList});
100100

101101
$('#content').html(dynRegEditView.render().el);
102102
app.navigate('dev/dynreg/edit', {trigger: true});
@@ -352,7 +352,7 @@ var DynRegEditView = Backbone.View.extend({
352352

353353
$("#scope .controls",this.el).html(new ListWidgetView({
354354
placeholder: 'new scope',
355-
autocomplete: _.uniq(_.flatten(app.systemScopeList.pluck("value"))),
355+
autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))),
356356
collection: this.scopeCollection}).render().el);
357357

358358
// build and bind contacts

‎openid-connect-server-webapp/src/main/webapp/resources/js/grant.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ var ApprovedSiteListView = Backbone.View.extend({
4545

4646
_.each(this.model.models, function(approvedSite) {
4747
// look up client
48-
var client = app.clientList.getByClientId(approvedSite.get('clientId'));
48+
var client = this.options.clientList.getByClientId(approvedSite.get('clientId'));
4949

5050
if (client != null) {
5151

5252
if (approvedSite.get('whitelistedSite') != null) {
53-
$('#grant-whitelist-table', this.el).append(new ApprovedSiteView({model: approvedSite, client: client}).render().el);
53+
$('#grant-whitelist-table', this.el).append(new ApprovedSiteView({model: approvedSite, client: client, systemScopeList: this.options.systemScopeList}).render().el);
5454
} else {
55-
$('#grant-table', this.el).append(new ApprovedSiteView({model: approvedSite, client: client}).render().el);
55+
$('#grant-table', this.el).append(new ApprovedSiteView({model: approvedSite, client: client, systemScopeList: this.options.systemScopeList}).render().el);
5656
}
5757

5858
}
@@ -158,7 +158,7 @@ var ApprovedSiteView = Backbone.View.extend({
158158

159159
this.$el.html(this.template(json));
160160

161-
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('allowedScopes'), systemScopes: app.systemScopeList}));
161+
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('allowedScopes'), systemScopes: this.options.systemScopeList}));
162162

163163
this.$('.dynamically-registered').tooltip({title: 'This client was dynamically registered'});
164164
this.$('.whitelisted-site').tooltip({title: 'This site was whitelisted by an adminstrator'});

‎openid-connect-server-webapp/src/main/webapp/resources/js/token.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ var AccessTokenView = Backbone.View.extend({
8484
$('.token-full', this.el).hide();
8585

8686
// show scopes
87-
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('scopes'), systemScopes: app.systemScopeList}));
87+
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('scopes'), systemScopes: this.options.systemScopeList}));
8888

8989
return this;
9090
},
@@ -206,7 +206,7 @@ var RefreshTokenView = Backbone.View.extend({
206206
$('.token-full', this.el).hide();
207207

208208
// show scopes
209-
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('scopes'), systemScopes: app.systemScopeList}));
209+
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('scopes'), systemScopes: this.options.systemScopeList}));
210210

211211
return this;
212212

@@ -308,17 +308,17 @@ var TokenListView = Backbone.View.extend({
308308

309309
_.each(this.model.access.models, function (token) {
310310
// look up client
311-
var client = app.clientList.getByClientId(token.get('clientId'));
311+
var client = _self.options.clientList.getByClientId(token.get('clientId'));
312312

313-
$('#access-token-table', _self.el).append(new AccessTokenView({model: token, client: client}).render().el);
313+
$('#access-token-table', _self.el).append(new AccessTokenView({model: token, client: client, systemScopeList: _self.options.systemScopeList}).render().el);
314314

315315
});
316316

317317
_.each(this.model.refresh.models, function (token) {
318318
// look up client
319-
var client = app.clientList.getByClientId(token.get('clientId'));
319+
var client = _self.options.clientList.getByClientId(token.get('clientId'));
320320

321-
$('#refresh-token-table', _self.el).append(new RefreshTokenView({model: token, client: client}).render().el);
321+
$('#refresh-token-table', _self.el).append(new RefreshTokenView({model: token, client: client, systemScopeList: _self.options.systemScopeList}).render().el);
322322

323323
});
324324

‎openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ var WhiteListListView = Backbone.View.extend({
6060
_.each(this.model.models, function (whiteList) {
6161

6262
// look up client
63-
var client = app.clientList.getByClientId(whiteList.get('clientId'));
63+
var client = this.options.clientList.getByClientId(whiteList.get('clientId'));
6464

6565
// if there's no client ID, this is an error!
6666
if (client != null) {
67-
$('#whitelist-table', this.el).append(new WhiteListView({model: whiteList, client: client}).render().el);
67+
$('#whitelist-table', this.el).append(new WhiteListView({model: whiteList, client: client, systemScopeList: this.options.systemScopeList}).render().el);
6868
}
6969

7070
}, this);
@@ -115,7 +115,7 @@ var WhiteListView = Backbone.View.extend({
115115

116116
this.$el.html(this.template(json));
117117

118-
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('allowedScopes'), systemScopes: app.systemScopeList}));
118+
$('.scope-list', this.el).html(this.scopeTemplate({scopes: this.model.get('allowedScopes'), systemScopes: this.options.systemScopeList}));
119119

120120
this.$('.dynamically-registered').tooltip({title: 'This client was dynamically registered'});
121121

‎openid-connect-server-webapp/src/main/webapp/resources/template/client.html‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818

1919
<script type="text/html" id="tmpl-client">
2020
<td>
21-
<% if (count) { %>
21+
<% if (count == 0) { %>
22+
<span class="label label-important">0</span>
23+
<% } else if (count != null) { %>
2224
<span class="label label-info"><%= count %></span>
2325
<% } else { %>
24-
<span class="label label-important">0</span>
26+
<!-- hold for count -->
2527
<% } %>
2628
<% if (client.dynamicallyRegistered) { %>
2729
<span class="label label-inverse dynamically-registered"><i class="icon-globe icon-white"></i></span>
@@ -63,8 +65,12 @@
6365
</td>
6466

6567
<td>
66-
<button class="btn btn-edit"><i class="icon-edit"></i> Edit</button> &nbsp;
67-
<button class="btn btn-warning btn-whitelist">Whitelist</button> &nbsp;
68+
<button class="btn btn-edit"><i class="icon-edit"></i> Edit</button> &nbsp;
69+
<% if (whiteList != null) { %>
70+
<button class="btn btn-warning btn-whitelist"><i class="icon-wrench icon-white"></i> Whitelist</button> &nbsp;
71+
<% } else { %>
72+
<button class="btn btn-warning btn-whitelist"><i class="icon-plus-sign icon-white"></i> Whitelist</button> &nbsp;
73+
<% } %>
6874
<button class="btn btn-danger btn-delete pull-right"><i class="icon-trash icon-white"></i> Delete</button>
6975
</td>
7076

0 commit comments

Comments
 (0)