Merge pull request #48 from davidbrewer/fix-authorization-headers-branch

Fix authorization headers feature
ruby-grape · Mar 8, 2016 · b8b5981 · b8b5981
2 parents 59372ab + 924038c
commit b8b5981
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 0.2.1 (Next)
 
 * Your contribution here.
+* Fixed header-based authorization - [@davidbrewer](https://github.com/davidbrewer).
 * Support Swagger-UI validatorUrl option - [@davidbrewer](https://github.com/davidbrewer).
 
 ### 0.2.0 (February 23, 2016)

diff --git a/app/views/grape_swagger_rails/application/index.html.erb b/app/views/grape_swagger_rails/application/index.html.erb
@@ -28,6 +28,7 @@
           console.log(swaggerUi);
         }
         $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
+        addApiKeyAuthorization();
       },
       onFailure: function(data) {
         if('console' in window) {
@@ -40,20 +41,20 @@
       apisSorter: "alpha"
     });
 
-    $('#input_apiKey').change(function() {
+    function addApiKeyAuthorization() {
       var key = $('#input_apiKey')[0].value;
 
-      if(key && key.trim() != "") {
+      if (key && key.trim() != "") {
         if (options.api_auth == 'basic') {
           key = "Basic " + Base64.encode(key);
         } else if (options.api_auth == 'bearer') {
           key = "Bearer " + key
         }
         window.swaggerUi.api.clientAuthorizations.add("key", new SwaggerClient.ApiKeyAuthorization(options.api_key_name, key, options.api_key_type));
-      } else {
-        window.swaggerUi.api.clientAuthorizations.add("key", null);
-      }
-    });
+      } 
+  }
+
+    $('#input_apiKey').change(addApiKeyAuthorization);
 
     window.swaggerUi.load();