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 450972141..bd8f45cf7 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
@@ -1013,6 +1013,7 @@ var ClientFormView = Backbone.View.extend({
var redirUriView = new ListWidgetView({
type:'uri',
placeholder: 'https://',
+ helpBlockText: $.t('client.client-form.redirect-uris-help'),
collection: this.redirectUrisCollection});
$("#redirectUris .controls",this.el).html(redirUriView.render().el);
this.listWidgetViews.push(redirUriView);
@@ -1023,8 +1024,9 @@ var ClientFormView = Backbone.View.extend({
});
var scopeView = new ListWidgetView({
- placeholder: 'new scope',
+ placeholder: $.t('client.client-form.scope-placeholder'),
autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))),
+ helpBlockText: $.t('client.client-form.scope-help'),
collection: this.scopeCollection});
$("#scope .controls",this.el).html(scopeView.render().el);
this.listWidgetViews.push(scopeView);
@@ -1075,6 +1077,7 @@ var ClientFormView = Backbone.View.extend({
var defaultAcrView = new ListWidgetView({
placeholder: $.t('client.client-form.acr-values-placeholder'),
// TODO: autocomplete from spec
+ helpBlockText: $.t('client.client-form.acr-values-help'),
collection: this.defaultAcrValuesCollection});
$('#defaultAcrValues .controls', this.el).html(defaultAcrView.render().el);
this.listWidgetViews.push(defaultAcrView);
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
index abfc5bac6..7863d8f50 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
@@ -454,6 +454,7 @@ var DynRegEditView = Backbone.View.extend({
var redirectUriView = new ListWidgetView({
type:'uri',
placeholder: 'https://',
+ helpBlockText: $.t('client.client-form.redirect-uris-help'),
collection: this.redirectUrisCollection});
$("#redirectUris .controls",this.el).html(redirectUriView.render().el);
this.listWidgetViews.push(redirectUriView);
@@ -468,6 +469,7 @@ var DynRegEditView = Backbone.View.extend({
var scopeView = new ListWidgetView({
placeholder: $.t('client.client-form.scope-placeholder'),
autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))),
+ helpBlockText: $.t('client.client-form.scope-help'),
collection: this.scopeCollection});
$("#scope .controls",this.el).html(scopeView.render().el);
this.listWidgetViews.push(scopeView);
@@ -479,6 +481,7 @@ var DynRegEditView = Backbone.View.extend({
var contactView = new ListWidgetView({
placeholder: $.t('client.client-form.contacts-placeholder'),
+ helpBlockText: $.t('client.client-form.contacts-help'),
collection: this.contactsCollection});
$("#contacts .controls div", this.el).html(contactView.render().el);
this.listWidgetViews.push(contactView);
@@ -504,6 +507,7 @@ var DynRegEditView = Backbone.View.extend({
var requestUriView = new ListWidgetView({
type: 'uri',
placeholder: 'https://',
+ helpBlockText: $.t('client.client-form.request-uri-help'),
collection: this.requestUrisCollection});
$('#requestUris .controls', this.el).html(requestUriView.render().el);
this.listWidgetViews.push(requestUriView);
@@ -516,6 +520,7 @@ var DynRegEditView = Backbone.View.extend({
var defaultAcrView = new ListWidgetView({
placeholder: $.t('client.client-form.acr-values-placeholder'),
// TODO: autocomplete from spec
+ helpBlockText: $.t('client.client-form.acr-values-help'),
collection: this.defaultAcrValuesCollection});
$('#defaultAcrValues .controls', this.el).html(defaultAcrView.render().el);
this.listWidgetViews.push(defaultAcrView);
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 d8eeb69f9..d85433d4b 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
@@ -26,6 +26,7 @@
"access-token-timeout-help": "Enter this time in seconds, minutes, or hours.",
"acr-values": "Default ACR Values",
"acr-values-placeholder": "new ACR value",
+ "acr-values-help": "Default Authentication Context Reference to request for this client",
"allow-introspection": "Allow calls to the Introspection Endpoint?",
"authentication-method": "Token Endpoint Authentication Method",
"authorization-code": "authorization code",
@@ -42,7 +43,7 @@
"client-secret": "Client Secret",
"client-secret-placeholder": "Type a secret",
"contacts": "Contacts",
- "contacts-help": "List of contacts for adminstrators of this client.",
+ "contacts-help": "List of contacts for administrators of this client.",
"contacts-placeholder": "new contact",
"credentials": "Credentials",
"crypto": {
@@ -99,6 +100,7 @@
"public": "Public",
"redelegation": "redelegation",
"redirect-uris": "Redirect URI(s)",
+ "redirect-uris-help": "URIs that the client can be redirected to after the authorization page",
"refresh": "refresh",
"refresh-tokens": "Refresh Tokens",
"refresh-tokens-issued": "Refresh tokens are issued for this client",
@@ -124,7 +126,8 @@
"show-secret": "Show Secret",
"unchanged": "unchanged"
},
- "scope-placeholder": "nytt scope",
+ "scope-placeholder": "new scope",
+ "scope-help": "OAuth scopes this client is allowed to request",
"seconds": "seconds",
"secret-asymmetric-jwt": "Asymmetrically-signed JWT assertion",
"secret-http": "Client Secret over HTTP Basic",
@@ -232,7 +235,7 @@
"active-tokens": "Number of currently active access tokens",
"application": "Application",
"approved-sites": "Approved Sites",
- "authorized": "Auktoriserad:",
+ "authorized": "Authorized:",
"dynamically-registered": "This client was dynamically registered",
"expires": "Expires:",
"last-accessed": "Last accessed:",
@@ -259,7 +262,10 @@
"or": " - OR - ",
"regtoken-placeholder": "Enter Registration Access Token",
"will-be-generated": "Will be generated",
- "warning": "Warning! You MUST protect your Client ID, Client Secret (if provided), and your Registration Access Token. If you lose your Client ID or Registration Access Token, you will no longer have access to your client's registration records and you will need to register a new client."
+ "warning": "Warning! You MUST protect your Client ID, Client Secret (if provided), and your Registration Access Token. If you lose your Client ID or Registration Access Token, you will no longer have access to your client's registration records and you will need to register a new client.",
+ "client-form": {
+ "scope-help": "Scopes that this resource will be able to introspect tokens for."
+ }
},
"scope": {
"manage": "Manage System Scopes",
@@ -320,7 +326,9 @@
"whitelist-form": {
"allowed-scopes": "Allowed Scopes",
"edit": "Edit Whitelisted Site",
- "new": "New Whitelisted Site"
+ "new": "New Whitelisted Site",
+ "scope-help": "List of scopes that will be automatically approved when this client makes a request",
+ "scope-placeholder": "new scope"
},
"whitelist-table": {
"no-sites": "There are no whitelisted sites. Use the whitelist button on the client management page to create one."
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
index e5b8ec753..1a6da0550 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
@@ -346,18 +346,6 @@ var ResRegEditView = Backbone.View.extend({
var _self = this;
- // build and bind registered redirect URI collection and view
- _.each(this.model.get("redirectUris"), function (redirectUri) {
- _self.redirectUrisCollection.add(new URIModel({item:redirectUri}));
- });
-
- var redirectUriView = new ListWidgetView({
- type:'uri',
- placeholder: 'https://',
- collection: this.redirectUrisCollection});
- $("#redirectUris .controls",this.el).html(redirectUriView.render().el);
- this.listWidgetViews.push(redirectUriView);
-
// build and bind scopes
var scopes = this.model.get("scope");
var scopeSet = scopes ? scopes.split(" ") : [];
@@ -368,6 +356,7 @@ var ResRegEditView = Backbone.View.extend({
var scopeView = new ListWidgetView({
placeholder: $.t('client.client-form.scope-placeholder'),
autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))),
+ helpBlockText: $.t('rsreg.client-form.scope-help'),
collection: this.scopeCollection});
$("#scope .controls",this.el).html(scopeView.render().el);
this.listWidgetViews.push(scopeView);
@@ -379,46 +368,16 @@ var ResRegEditView = Backbone.View.extend({
var contactView = new ListWidgetView({
placeholder: $.t('client.client-form.contacts-placeholder'),
+ helpBlockText: $.t('client.client-form.contacts-help'),
collection: this.contactsCollection});
$("#contacts .controls div", this.el).html(contactView.render().el);
this.listWidgetViews.push(contactView);
- // build and bind request URIs
- _.each(this.model.get('requestUris'), function (requestUri) {
- _self.requestUrisCollection.add(new URIModel({item:requestUri}));
- });
-
- var requestUriView = new ListWidgetView({
- type: 'uri',
- placeholder: 'https://',
- collection: this.requestUrisCollection});
- $('#requestUris .controls', this.el).html(requestUriView.render().el);
- this.listWidgetViews.push(requestUriView);
-
- // build and bind default ACR values
- _.each(this.model.get('defaultAcrValues'), function (defaultAcrValue) {
- _self.defaultAcrValuesCollection.add(new Backbone.Model({item:defaultAcrValue}));
- });
-
- var defaultAcrView = new ListWidgetView({
- placeholder: $.t('client.client-form.acr-values-placeholder'),
- // TODO: autocomplete from spec
- collection: this.defaultAcrValuesCollection});
- $('#defaultAcrValues .controls', this.el).html(defaultAcrView.render().el);
- this.listWidgetViews.push(defaultAcrView);
-
this.toggleClientCredentials();
this.previewLogo();
// disable unsupported JOSE algorithms
- this.disableUnsupportedJOSEItems(app.serverConfiguration.request_object_signing_alg_values_supported, '#requestObjectSigningAlg option');
- this.disableUnsupportedJOSEItems(app.serverConfiguration.userinfo_signing_alg_values_supported, '#userInfoSignedResponseAlg option');
- this.disableUnsupportedJOSEItems(app.serverConfiguration.userinfo_encryption_alg_values_supported, '#userInfoEncryptedResponseAlg option');
- this.disableUnsupportedJOSEItems(app.serverConfiguration.userinfo_encryption_enc_values_supported, '#userInfoEncryptedResponseEnc option');
- this.disableUnsupportedJOSEItems(app.serverConfiguration.id_token_signing_alg_values_supported, '#idTokenSignedResponseAlg option');
- this.disableUnsupportedJOSEItems(app.serverConfiguration.id_token_encryption_alg_values_supported, '#idTokenEncryptedResponseAlg option');
- this.disableUnsupportedJOSEItems(app.serverConfiguration.id_token_encryption_enc_values_supported, '#idTokenEncryptedResponseEnc option');
this.disableUnsupportedJOSEItems(app.serverConfiguration.token_endpoint_auth_signing_alg_values_supported, '#tokenEndpointAuthSigningAlg option');
this.$('.nyi').clickover({
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js b/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js
index a27c72688..051920b06 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js
@@ -339,8 +339,9 @@ var WhiteListFormView = Backbone.View.extend({
});
var scopeView = new ListWidgetView({
- placeholder: 'new scope here',
+ placeholder: $.t('whitelist.whitelist-form.scope-placeholder'),
autocomplete: this.options.client.scope,
+ helpBlockText: $.t('whitelist.whitelist-form.scope-help'),
collection: this.scopeCollection});
$("#scope .controls",this.el).html(scopeView.render().el);
this.listWidgetViews.push(scopeView);