Remove global auth object references and fix header api key adding mechanism

Fixes #1033

.jshintrc

@@ -18,18 +18,21 @@
   "trailing": true,
   "smarttabs": true,
   "globals": {
-    "Backbone": false,
+
+    // Libraries
     "_": false,
     "$": false,
+    "Backbone": false,
+    "Handlebars": false,
     "jQuery": false,
     "marked": false,
-    "Docs": false,
     "SwaggerClient": false,
-    "Handlebars": false,
-    "ApiKeyAuthorization": false,
-    "PasswordAuthorization": false,
     "hljs": false,
     "SwaggerUi": false,
-    "swaggerUi": false // TODO: remove me
+
+    // Global object
+    // TODO: remove these
+    "swaggerUi": false,
+    "Docs": false
   }
 }

dist/index.html

@@ -61,8 +61,9 @@
         var key = encodeURIComponent($('#input_apiKey')[0].value);
         log("key: " + key);
         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);
-            window.authorizations.add("api_key", new ApiKeyAuthorization("api_key", key, "query"));
         }
       }
 
@@ -78,6 +79,12 @@
       */
 
       window.swaggerUi.load();
+
+      function log() {
+        if ('console' in window) {
+          console.log.apply(console, arguments);
+        }
+      }
   });
   </script>
 </head>

dist/swagger-ui.js

@@ -59,7 +59,7 @@ window.SwaggerUi = Backbone.Router.extend({
 
     // Event handler for when the baseUrl/apiKey is entered by user
     this.headerView.on('update-swagger-ui', function(data) {
-      return this.updateSwaggerUi(data);
+      return that.updateSwaggerUi(data);
     });
   },
 
@@ -1025,7 +1025,7 @@ SwaggerUi.Views.ApiKeyButton = Backbone.View.extend({ // TODO: append this to gl
 
 
   applyApiKey: function(){
-    var keyAuth = new ApiKeyAuthorization(
+    var keyAuth = new SwaggerClient.ApiKeyAuthorization(
       this.model.name,
       $('#input_apiKey_entry').val(),
       this.model.in
@@ -1078,7 +1078,7 @@ SwaggerUi.Views.BasicAuthButton = Backbone.View.extend({
   applyPassword: function(){
     var username = $('.input_username').val();
     var password = $('.input_password').val();
-    var basicAuth = new PasswordAuthorization('basic', username, password);
+    var basicAuth = new SwaggerClient.PasswordAuthorization('basic', username, password);
     window.authorizations.add(this.model.type, basicAuth);
     window.swaggerUi.load();
     $('#basic_auth_container').hide();

src/main/html/index.html

@@ -61,8 +61,9 @@
         var key = encodeURIComponent($('#input_apiKey')[0].value);
         log("key: " + key);
         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);
-            window.authorizations.add("api_key", new ApiKeyAuthorization("api_key", key, "query"));
         }
       }
 
@@ -78,6 +79,12 @@
       */
 
       window.swaggerUi.load();
+
+      function log() {
+        if ('console' in window) {
+          console.log.apply(console, arguments);
+        }
+      }
   });
   </script>
 </head>

src/main/javascript/SwaggerUi.js

@@ -53,7 +53,7 @@ window.SwaggerUi = Backbone.Router.extend({
 
     // Event handler for when the baseUrl/apiKey is entered by user
     this.headerView.on('update-swagger-ui', function(data) {
-      return this.updateSwaggerUi(data);
+      return that.updateSwaggerUi(data);
     });
   },
 

src/main/javascript/view/ApiKeyButton.js

@@ -18,7 +18,7 @@ SwaggerUi.Views.ApiKeyButton = Backbone.View.extend({ // TODO: append this to gl
 
 
   applyApiKey: function(){
-    var keyAuth = new ApiKeyAuthorization(
+    var keyAuth = new SwaggerClient.ApiKeyAuthorization(
       this.model.name,
       $('#input_apiKey_entry').val(),
       this.model.in

src/main/javascript/view/BasicAuthButton.js

@@ -20,7 +20,7 @@ SwaggerUi.Views.BasicAuthButton = Backbone.View.extend({
   applyPassword: function(){
     var username = $('.input_username').val();
     var password = $('.input_password').val();
-    var basicAuth = new PasswordAuthorization('basic', username, password);
+    var basicAuth = new SwaggerClient.PasswordAuthorization('basic', username, password);
     window.authorizations.add(this.model.type, basicAuth);
     window.swaggerUi.load();
     $('#basic_auth_container').hide();