Fixing http adapter to allow HTTPS connections via HTTP (axios#959)

Khaledgarbaya · JustinBeckwith · commit 7d9a29ee4c59 · 2018-07-04T23:51:11.000-07:00
diff --git a/index.d.ts b/index.d.ts
@@ -17,7 +17,8 @@ export interface AxiosProxyConfig {
   auth?: {
     username: string;
     password:string;
-  }
+  };
+  protocol?: string;
 }
 
 export type Method = 
diff --git a/lib/adapters/http.js b/lib/adapters/http.js
@@ -13,6 +13,8 @@ var pkg = require('./../../package.json');
 var createError = require('../core/createError');
 var enhanceError = require('../core/enhanceError');
 
+var isHttps = /https:?/;
+
 /*eslint consistent-return:0*/
 module.exports = function httpAdapter(config) {
   return new Promise(function dispatchHttpRequest(resolvePromise, rejectPromise) {
@@ -76,8 +78,8 @@ module.exports = function httpAdapter(config) {
       delete headers.Authorization;
     }
 
-    var isHttps = protocol === 'https:';
-    var agent = isHttps ? config.httpsAgent : config.httpAgent;
+    var isHttpsRequest = isHttps.test(protocol);
+    var agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
 
     var options = {
       path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
@@ -130,15 +132,16 @@ module.exports = function httpAdapter(config) {
     }
 
     var transport;
+    var isHttpsProxy = isHttpsRequest && (proxy ? isHttps.test(proxy.protocol) : true);
     if (config.transport) {
       transport = config.transport;
     } else if (config.maxRedirects === 0) {
-      transport = isHttps ? https : http;
+      transport = isHttpsProxy ? https : http;
     } else {
       if (config.maxRedirects) {
         options.maxRedirects = config.maxRedirects;
       }
-      transport = isHttps ? httpsFollow : httpFollow;
+      transport = isHttpsProxy ? httpsFollow : httpFollow;
     }
 
     if (config.maxContentLength && config.maxContentLength > -1) {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ export interface AxiosProxyConfig {`
`17`	`17`	`auth?: {`
`18`	`18`	`username: string;`
`19`	`19`	`password:string;`
`20`		`- }`
	`20`	`+ };`
	`21`	`+ protocol?: string;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`export type Method =`