Merge pull request #65 from callumacrae/http-auth

Added auth functionality to server option

Author: marcelduran

lib/helper.js

@@ -181,6 +181,7 @@ function normalizeServer(server) {
   return {
     protocol: server.protocol,
     hostname: server.hostname,
+    auth: server.auth,
     pathname: server.pathname,
     port: parseInt(server.port, 10) || (server.protocol === 'https:' ? 443 : 80)
   };

lib/webpagetest.js

@@ -58,20 +58,34 @@ var filenames = {
 // GET helper function
 function get(config, pathname, proxy, callback, encoding) {
   var protocol = (config.protocol === 'https:' ? https : http),
-      options = proxy ? {
-        host: proxy.split(':')[0],
-        port: proxy.split(':')[1],
-        path: config.protocol+ '//' +config.hostname+':' + config.port+pathname,
-        headers: {
-          Host: config.hostname
-        }
-      } :
-      {
-        path: pathname,
-        host: config.hostname,
-        port: config.port,
-        headers: {}
-      };
+      options;
+
+  if (proxy) {
+    var pathForProxy = config.protocol + '//';
+
+    if (config.auth) {
+      pathForProxy += config.auth + '@';
+    }
+
+    pathForProxy += config.hostname + ':' + config.port + pathname;
+
+    options = {
+      host: proxy.split(':')[0],
+      port: proxy.split(':')[1],
+      path: pathForProxy,
+      headers: {
+        Host: config.hostname
+      }
+    };
+  } else {
+    options = {
+      path: pathname,
+      host: config.hostname,
+      auth: config.auth,
+      port: config.port,
+      headers: {}
+    };
+  }
 
   if (encoding !== 'binary') {
     options.headers['accept-encoding'] = 'gzip,deflate';

test/edge-cases-test.js

@@ -144,6 +144,7 @@ describe('Edge Cases of', function() {
     it('when getting a valid standard server uri returns server info object', function() {
       var server = helper.normalizeServer('example.com');
       assert.deepEqual(server, {
+        auth: null,
         protocol: 'http:',
         hostname: 'example.com',
         pathname: '/',
@@ -152,8 +153,9 @@ describe('Edge Cases of', function() {
     });
 
     it('when getting a valid full server uri returns server info object', function() {
-      var server = helper.normalizeServer('http://example.com:8000/foo');
+      var server = helper.normalizeServer('http://foo:bar@example.com:8000/foo');
       assert.deepEqual(server, {
+        auth: 'foo:bar',
         protocol: 'http:',
         hostname: 'example.com',
         pathname: '/foo',
@@ -164,6 +166,7 @@ describe('Edge Cases of', function() {
     it('when getting a https server uri returns server info object', function() {
       var server = helper.normalizeServer('https://example.com');
       assert.deepEqual(server, {
+        auth: null,
         protocol: 'https:',
         hostname: 'example.com',
         pathname: '/',