Merge pull request #129 from Spinarooni/master

Fallback to system defined proxy. Issue #126
shanalikhan · Nov 3, 2016 · 7bfa9e2 · 7bfa9e2
2 parents 4234f19 + d5a5215
commit 7bfa9e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/githubService.ts b/src/githubService.ts
@@ -4,10 +4,10 @@ import * as envir from './environmentPath';
 import * as fileManager from './fileManager';
 import * as vscode from 'vscode';
 
+var proxyURL: string = vscode.workspace.getConfiguration("http")["proxy"] || process.env["http_proxy"];
 var GitHubApi = require("github");
-
 var github = new GitHubApi({
-    proxy: vscode.workspace.getConfiguration("http")["proxy"],
+    proxy: proxyURL,
     version: "3.0.0",
 });
 

diff --git a/src/util.ts b/src/util.ts
@@ -8,7 +8,7 @@ import * as fs from 'fs';
 var adm_zip = require('adm-zip');
 var temp = require('temp').track();
 var HttpsProxyAgent = require("https-proxy-agent");
-var proxy = vscode.workspace.getConfiguration("http")["proxy"];
+var proxy = vscode.workspace.getConfiguration("http")["proxy"] || process.env["http_proxy"];
 var agent = null;
 if(proxy!=""){
     agent = new HttpsProxyAgent(proxy);