Merge pull request #219 from mashery/api_basic_auth_fix

Refs #217 api level basic auth
mashery · Oct 15, 2014 · dcacf8d · dcacf8d
2 parents 34c15ba + 51fd600
commit dcacf8d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/app.js b/app.js
@@ -949,6 +949,12 @@ function processRequest(req, res, next) {
             options.path += apiConfig.auth.key.param + '=' + apiKey;
         }
 
+        // Basic Auth support
+        if (apiConfig.auth == 'basicAuth') {
+            options.headers['Authorization'] = 'Basic ' + new Buffer(reqQuery.apiUsername + ':' + reqQuery.apiPassword).toString('base64');
+            console.log(options.headers['Authorization'] );
+        }
+
         //
         // Perform signature routine - force defaults on required configuration items.
         //

diff --git a/dump.rdb b/dump.rdb
diff --git a/public/javascripts/docs.js b/public/javascripts/docs.js
@@ -193,9 +193,11 @@
         var params = $(this).serializeArray(),
             apiKey = { name: 'apiKey', value: $('input[name=key]').val() },
             apiSecret = { name: 'apiSecret', value: $('input[name=secret]').val() },
-            apiName = { name: 'apiName', value: $('input[name=apiName]').val() };
+            apiName = { name: 'apiName', value: $('input[name=apiName]').val() },
+            apiUsername = { name: 'apiUsername', value: $('input[name=username]').val() },
+            apiPassword = { name: 'apiPassword', value: $('input[name=password]').val() };;
 
-        params.push(apiKey, apiSecret, apiName);
+        params.push(apiKey, apiSecret, apiName, apiUsername, apiPassword);
 
         //Accounts for array values
         for (i in params) {

diff --git a/views/api.jade b/views/api.jade
@@ -37,14 +37,22 @@ block content
                   - if (oAuthVersion)
                       label(for='key') Client ID
                       - var secure ='authrequired'
+                      input(id='key', name='key', value=defaultKey, style='color=#EEEEEE')
+                  - else if (apiInfo.auth == 'basicAuth')
+                    label(for='username') User name
+                    input(id='username', name='username', value=defaultKey, style='color=#EEEEEE')
                   - else
                     label(for='key') API Key
                     - var secure =''
-                  input(id='key', name='key', value=defaultKey, style='color=#EEEEEE')
+                    input(id='key', name='key', value=defaultKey, style='color=#EEEEEE')
               div
                   - if (oAuthVersion)
                       label(for='secret') Client Secret
                       input(id='secret', name='secret', value=defaultSecret, style='color=#EEEEEE')
+                  - else if (apiInfo.auth == 'basicAuth')
+                      label(for='password') Password
+                      input(id='password', name='password', type='password', value=defaultKey, style='color=#EEEEEE')
+
                   - if (apiInfo.auth.signature)
                       label(for='secret') Shared Secret
                       input(id='secret', name='secret', value=defaultSecret, style='color=#EEEEEE')