kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #2213

Browse Source
This commit is contained in:
Anna Bodnia
2016-06-15 17:54:47 +03:00
parent 45cf93d210
commit f01fb9561b
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dist/swagger-ui.js vendored
View File

@@ -19588,7 +19588,7 @@ SwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({
var authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz); var authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz);
return _.map(data, function (auth, name) { return _.map(data, function (auth, name) {
var isBasic = authz.basic && auth.type === 'basic'; var isBasic = authz[name] && auth.type === 'basic' && authz[name].username && authz[name].password;
_.extend(auth, { _.extend(auth, {
title: name title: name
@@ -19598,8 +19598,8 @@ SwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({
_.extend(auth, { _.extend(auth, {
isLogout: true, isLogout: true,
value: isBasic ? undefined : authz[name].value, value: isBasic ? undefined : authz[name].value,
username: isBasic ? authz.basic.username : undefined, username: isBasic ? authz[name].username : undefined,
password: isBasic ? authz.basic.password : undefined, password: isBasic ? authz[name].password : undefined,
valid: true valid: true
}); });
} }
@@ -19748,9 +19748,7 @@ SwaggerUi.Views.AuthView = Backbone.View.extend({
e.preventDefault(); e.preventDefault();
this.authsCollectionView.collection.forEach(function (auth) { this.authsCollectionView.collection.forEach(function (auth) {
var name = auth.get('type') === 'basic' ? 'basic' : auth.get('title'); window.swaggerUi.api.clientAuthorizations.remove(auth.get('title'));
window.swaggerUi.api.clientAuthorizations.remove(name);
}); });
this.router.load(); this.router.load();
@@ -19914,12 +19912,9 @@ SwaggerUi.Views.BasicAuthView = Backbone.View.extend({
if (!this.model.get('username')) { if (!this.model.get('username')) {
this.$(this.selectors.usernameInput).addClass(this.cls.error); this.$(this.selectors.usernameInput).addClass(this.cls.error);
} }
if (!this.model.get('password')) {
this.$(this.selectors.passwordInput).addClass(this.cls.error);
}
} }
}); });
'use strict'; 'use strict';
SwaggerUi.Views.ContentTypeView = Backbone.View.extend({ SwaggerUi.Views.ContentTypeView = Backbone.View.extend({
@@ -20152,15 +20147,26 @@ SwaggerUi.Models.Oauth2Model = Backbone.Model.extend({
}, },
validate: function () { validate: function () {
var valid = _.findIndex(this.get('scopes'), function (o) { var valid = false;
return o.checked === true; var scp = this.get('scopes');
}) > -1; var idx = _.findIndex(scp, function (o) {
return o.checked === true;
});
this.set('valid', valid); if(scp.length > 0 && idx >= 0) {
valid = true;
}
return valid; if(scp.length === 0) {
valid = true;
}
this.set('valid', valid);
return valid;
} }
}); });
'use strict'; 'use strict';
SwaggerUi.Views.Oauth2View = Backbone.View.extend({ SwaggerUi.Views.Oauth2View = Backbone.View.extend({

4
dist/swagger-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/main/javascript/view/AuthsCollection.js
View File

@@ -69,7 +69,7 @@ SwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({
var authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz); var authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz);
return _.map(data, function (auth, name) { return _.map(data, function (auth, name) {
var isBasic = authz.basic && auth.type === 'basic'; var isBasic = authz[name] && auth.type === 'basic' && authz[name].username && authz[name].password;
_.extend(auth, { _.extend(auth, {
title: name title: name
@@ -79,8 +79,8 @@ SwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({
_.extend(auth, { _.extend(auth, {
isLogout: true, isLogout: true,
value: isBasic ? undefined : authz[name].value, value: isBasic ? undefined : authz[name].value,
username: isBasic ? authz.basic.username : undefined, username: isBasic ? authz[name].username : undefined,
password: isBasic ? authz.basic.password : undefined, password: isBasic ? authz[name].password : undefined,
valid: true valid: true
}); });
} }