');
- renderOneAuth: function (authModel) {
- var authEl;
- var type = authModel.get('type');
+ //todo refactor, copy-pasted from MainView.js
+ for (name in this.model) {
+ auth = this.model[name];
- if (type === 'apiKey') {
- authEl = new SwaggerUi.Views.ApiKeyAuthView({model: authModel, router: this.router}).render().el;
- this.$innerEl.append(authEl);
- } else if (type === 'basic' && this.$innerEl.find('.basic_auth_container').length === 0) {
- authEl = new SwaggerUi.Views.BasicAuthView({model: authModel, router: this.router}).render().el;
- this.$innerEl.append(authEl);
+ if (auth.type === 'apiKey') {
+ authEl = new SwaggerUi.Views.ApiKeyButton({model: auth, router: this.router}).render().el;
+ el.append(authEl);
+ }
+
+ if (auth.type === 'basic' && el.find('.basic_auth_container').length === 0) {
+ authEl = new SwaggerUi.Views.BasicAuthButton({model: auth, router: this.router}).render().el;
+ el.append(authEl);
+ }
}
- },
-
- isValidCollection: function () {
- return this.collection.length === this.collection.where({ valid: true }).length;
- },
-
- authorize: function () {
- this.collection.forEach(function (auth) {
- var keyAuth, basicAuth;
- var type = auth.get('type');
-
- if (type === 'apiKey') {
- keyAuth = new SwaggerClient.ApiKeyAuthorization(
- auth.get('name'),
- auth.get('value'),
- auth.get('in')
- );
-
- this.router.api.clientAuthorizations.add(auth.get('name'), keyAuth);
- } else if (type === 'basic') {
- basicAuth = new SwaggerClient.PasswordAuthorization(auth.get('username'), auth.get('password'));
- this.router.api.clientAuthorizations.add(auth.get('type'), basicAuth);
- }
- }, this);
-
- this.router.load();
- },
-
- isAuthorizedCollection: function () {
- return this.collection.length === this.collection.where({ isLogout: true }).length;
- },
-
- logoutClick: function (e) {
- e.preventDefault();
-
- this.collection.forEach(function (auth) {
- var name = auth.get('name');
-
- window.swaggerUi.api.clientAuthorizations.remove(name);
- });
-
- this.router.load();
+ return el.html();
}
});
diff --git a/src/main/javascript/view/MainView.js b/src/main/javascript/view/MainView.js
index 9d3c748f..7eb8aae2 100644
--- a/src/main/javascript/view/MainView.js
+++ b/src/main/javascript/view/MainView.js
@@ -89,18 +89,9 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
$(this.el).html(Handlebars.templates.main(this.model));
this.model.securityDefinitions = this.model.securityDefinitions || {};
- for (name in this.model.securityDefinitions) {
- auth = this.model.securityDefinitions[name];
-
- if (auth.type === 'apiKey') {
- authEl = new SwaggerUi.Views.ApiKeyButton({model: auth, router: this.router}).render().el;
- $('.auth_main_container').append(authEl);
- }
-
- if (auth.type === 'basic' && $('.auth_main_container .basic_auth_container').length === 0) {
- authEl = new SwaggerUi.Views.BasicAuthButton({model: auth, router: this.router}).render().el;
- $('.auth_main_container').append(authEl);
- }
+ if (this.model.securityDefinitions) {
+ this.authView = new SwaggerUi.Views.AuthView({model: this.model.securityDefinitions});
+ this.$('.authorize-wrapper').append(this.authView.render().el);
}
// Render each resource
diff --git a/src/main/javascript/view/OperationView.js b/src/main/javascript/view/OperationView.js
index dfc34e66..90125b4e 100644
--- a/src/main/javascript/view/OperationView.js
+++ b/src/main/javascript/view/OperationView.js
@@ -91,9 +91,54 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
this.model.isReadOnly = true;
}
this.model.description = this.model.description || this.model.notes;
-
- this.handleAuth();
-
+ this.model.oauth = null;
+ modelAuths = this.model.authorizations || this.model.security;
+ if (modelAuths) {
+ if (Array.isArray(modelAuths)) {
+ for (l = 0, len = modelAuths.length; l < len; l++) {
+ auths = modelAuths[l];
+ for (key in auths) {
+ for (a in this.auths) {
+ auth = this.auths[a];
+ if (key === auth.name) {
+ if (auth.type === 'oauth2') {
+ this.model.oauth = {};
+ this.model.oauth.scopes = [];
+ ref1 = auth.value.scopes;
+ for (k in ref1) {
+ v = ref1[k];
+ scopeIndex = auths[key].indexOf(k);
+ if (scopeIndex >= 0) {
+ o = {
+ scope: k,
+ description: v
+ };
+ this.model.oauth.scopes.push(o);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ } else {
+ for (k in modelAuths) {
+ v = modelAuths[k];
+ if (k === 'oauth2') {
+ if (this.model.oauth === null) {
+ this.model.oauth = {};
+ }
+ if (this.model.oauth.scopes === void 0) {
+ this.model.oauth.scopes = [];
+ }
+ for (m = 0, len1 = v.length; m < len1; m++) {
+ o = v[m];
+ this.model.oauth.scopes.push(o);
+ }
+ }
+ }
+ }
+ }
if (typeof this.model.responses !== 'undefined') {
this.model.responseMessages = [];
ref2 = this.model.responses;
@@ -804,95 +849,6 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
}
}
return null;
- },
-
- handleAuth: function () {
- var modelAuths, auths, i, l, len, len1, ref1, scopeIndex;
- var definitionsMap = {};
-
- this.auths = this.auths || [];
-
- for (l = 0, len = this.auths.length; l < len; l++) {
- definitionsMap[this.auths[l].name] = this.auths[l].value;
- }
-
- this.model.oauth = null;
-
- modelAuths = this.model.authorizations || this.model.security;
-
- if (!modelAuths) { return null; }
-
- if (Array.isArray(modelAuths)) {
- modelAuths.forEach(function (security) {
- for (i in security) {
- security[i] = security[i] || {};
- switch (security[i].type) {
- case 'apiKey': break;
- case 'basic': break;
- default:
- //handle from definitions
- }
- }
- });
- }
-
-
- if (Array.isArray(modelAuths)) {
- for (l = 0, len = modelAuths.length; l < len; l++) {
-
- //auths - single auth from security
- auths = modelAuths[l];
- for (key in auths) {
-
- //this.auths - auth from definitions
- for (a in this.auths) {
- //auth - one single auth from definition
- auth = this.auths[a];
-
- // if security name is in definitions
- if (key === auth.name) {
-
- if (auth.type === 'oauth2') {
- this.model.oauth = {};
- this.model.oauth.scopes = [];
- ref1 = auth.value.scopes;
- for (k in ref1) {
- v = ref1[k];
- scopeIndex = auths[key].indexOf(k);
- if (scopeIndex >= 0) {
- o = {
- scope: k,
- description: v
- };
- this.model.oauth.scopes.push(o);
- }
- }
- }
- //if (auth.type === 'apiKey') {
- // console.log('apiKey')
- //}
- }
- }
- }
- }
- } else {
- for (k in modelAuths) {
- v = modelAuths[k];
- if (k === 'oauth2') {
- if (this.model.oauth === null) {
- this.model.oauth = {};
- }
- if (this.model.oauth.scopes === void 0) {
- this.model.oauth.scopes = [];
- }
- for (m = 0, len1 = v.length; m < len1; m++) {
- o = v[m];
- this.model.oauth.scopes.push(o);
- }
- }
- }
- }
-
}
});
diff --git a/src/main/javascript/view/PopupView.js b/src/main/javascript/view/PopupView.js
index a4dced53..999ee366 100644
--- a/src/main/javascript/view/PopupView.js
+++ b/src/main/javascript/view/PopupView.js
@@ -8,11 +8,6 @@ SwaggerUi.Views.PopupView = Backbone.View.extend({
template: Handlebars.templates.popup,
className: 'api-popup-dialog',
- selectors: {
- content: '.api-popup-content',
- main : '#swagger-ui-container'
- },
-
initialize: function(){},
render: function () {
@@ -22,8 +17,7 @@ SwaggerUi.Views.PopupView = Backbone.View.extend({
dh = $win.height();
st = $win.scrollTop();
this.$el.html(this.template(this.model));
- this.$(this.selectors.content).append(this.model.content);
- $(this.selectors.main).first().append(this.el);
+ $(document.body).append(this.el);
dlgWd = this.$el.outerWidth();
dlgHt = this.$el.outerHeight();
top = (dh -dlgHt)/2 + st;
diff --git a/src/main/less/auth.less b/src/main/less/auth.less
index cae856e3..54cb8696 100644
--- a/src/main/less/auth.less
+++ b/src/main/less/auth.less
@@ -19,6 +19,13 @@
.oauth_submit { text-align: center; }
+ .authorize__btn {
+ &:hover {
+ text-decoration: underline;
+ cursor: pointer;
+ }
+ }
+
.auth_container {
.basic_auth__title {
diff --git a/src/main/template/auth_button.handlebars b/src/main/template/auth_button.handlebars
index b029278d..e5431b47 100644
--- a/src/main/template/auth_button.handlebars
+++ b/src/main/template/auth_button.handlebars
@@ -1 +1 @@
-
Click to Authorize{{#if isLogout}}/Logout {{/if}}
+
Authorize
diff --git a/src/main/template/main.handlebars b/src/main/template/main.handlebars
index fb678d2a..4c5c19f1 100644
--- a/src/main/template/main.handlebars
+++ b/src/main/template/main.handlebars
@@ -16,6 +16,8 @@