diff --git a/dist/css/print.css b/dist/css/print.css index 19c35a2e..b68b78fa 100644 --- a/dist/css/print.css +++ b/dist/css/print.css @@ -1188,6 +1188,16 @@ text-decoration: underline; cursor: pointer; } +.swagger-section #auth_container { + color: #fff; + width: 190px; + float: left; + border: none; + padding: 5px; +} +.swagger-section #auth_container .authorize__btn { + color: #fff; +} .swagger-section .auth_container { padding: 0 0 10px; margin-bottom: 5px; diff --git a/dist/css/screen.css b/dist/css/screen.css index ee944ed0..a4176439 100644 --- a/dist/css/screen.css +++ b/dist/css/screen.css @@ -1188,6 +1188,16 @@ text-decoration: underline; cursor: pointer; } +.swagger-section #auth_container { + color: #fff; + width: 190px; + float: left; + border: none; + padding: 5px; +} +.swagger-section #auth_container .authorize__btn { + color: #fff; +} .swagger-section .auth_container { padding: 0 0 10px; margin-bottom: 5px; diff --git a/dist/index.html b/dist/index.html index d95471a1..8dc3a623 100644 --- a/dist/index.html +++ b/dist/index.html @@ -67,7 +67,7 @@ window.SwaggerTranslator.translate(); } - addApiKeyAuthorization(); +// addApiKeyAuthorization(); }, onFailure: function(data) { log("Unable to Load SwaggerUI"); @@ -79,16 +79,16 @@ showRequestHeaders: false }); - function addApiKeyAuthorization(){ - var key = encodeURIComponent($('#input_apiKey')[0].value); - if(key && key.trim() != "") { - var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query"); - window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth); - log("added key " + key); - } - } - - $('#input_apiKey').change(addApiKeyAuthorization); +// function addApiKeyAuthorization(){ +// var key = encodeURIComponent($('#input_apiKey')[0].value); +// if(key && key.trim() != "") { +// var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query"); +// window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth); +// log("added key " + key); +// } +// } +// +// $('#input_apiKey').change(addApiKeyAuthorization); // if you have an apiKey you would like to pre-populate on the page for demonstration purposes... /* @@ -113,7 +113,7 @@ swagger
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js index 492daaff..babb0b97 100644 --- a/dist/swagger-ui.js +++ b/dist/swagger-ui.js @@ -18849,6 +18849,10 @@ window.SwaggerUi = Backbone.Router.extend({ if (this.mainView) { this.mainView.clear(); } + + if (this.authView) { + this.authView.remove(); + } var url = this.options.url; if (url && url.indexOf('http') !== 0) { url = this.buildUrl(window.location.href.toString(), url); @@ -18880,6 +18884,7 @@ window.SwaggerUi = Backbone.Router.extend({ // This is bound to success handler for SwaggerApi // so it gets called when SwaggerApi completes loading render: function(){ + var authsModel; this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...'); this.mainView = new SwaggerUi.Views.MainView({ model: this.api, @@ -18887,6 +18892,20 @@ window.SwaggerUi = Backbone.Router.extend({ swaggerOptions: this.options, router: this }).render(); + if (!_.isEmpty(this.api.securityDefinitions)){ + authsModel = { + auths: _.map(this.api.securityDefinitions, function (auth, name) { + var result = {}; + result[name] = auth; + return result; + }) + }; + this.authView = new SwaggerUi.Views.AuthButtonView({ + model: authsModel, + router: this + }); + $('#auth_container').append(this.authView.render().el); + } this.showMessage(); switch (this.options.docExpansion) { case 'full': @@ -19318,8 +19337,7 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({ } this.trigger('update-swagger-ui', { - url: $('#input_baseUrl').val(), - apiKey: $('#input_apiKey').val() + url: $('#input_baseUrl').val() }); }, @@ -19330,7 +19348,6 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({ $('#input_baseUrl').val(url); - //$('#input_apiKey').val(apiKey); if (trigger) { this.trigger('update-swagger-ui', {url:url}); } @@ -19422,26 +19439,9 @@ SwaggerUi.Views.MainView = Backbone.View.extend({ }, render: function () { - // Render the outer container for resources - var authsModel, parsedDefinitions; - $(this.el).html(Handlebars.templates.main(this.model)); this.model.securityDefinitions = this.model.securityDefinitions || {}; - if (!_.isEmpty(this.model.securityDefinitions)) { - parsedDefinitions = _.map(this.model.securityDefinitions, function (auth, name) { - var result = {}; - result[name] = auth; - return result; - }); - - authsModel = { auths: parsedDefinitions }; - - authsModel.isLogout = !_.isEmpty(window.swaggerUi.api.clientAuthorizations.authz); - this.authView = new SwaggerUi.Views.AuthButtonView({model: authsModel, router: this.router}); - this.$('.authorize-wrapper').append(this.authView.render().el); - } - // Render each resource var resources = {}; diff --git a/dist/swagger-ui.min.js b/dist/swagger-ui.min.js index 99f5c22d..5a2b7705 100644 --- a/dist/swagger-ui.min.js +++ b/dist/swagger-ui.min.js @@ -1,9 +1,9 @@ (function(){function e(){e.history=e.history||[],e.history.push(arguments),this.console&&console.log(Array.prototype.slice.call(arguments)[0])}this.Handlebars=this.Handlebars||{},this.Handlebars.templates=this.Handlebars.templates||{},this.Handlebars.templates.apikey_auth=Handlebars.template({1:function(e,t,n,r){var i,a="function",o=t.helperMissing,s=this.escapeExpression;return' '+s((i=null!=(i=t.value||(null!=e?e.value:e))?i:o,typeof i===a?i.call(e,{name:"value",hash:{},data:r}):i))+"\n"},3:function(e,t,n,r){return" \n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,r){var i,a,o="function",s=t.helperMissing,l=this.escapeExpression,u="