Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

Commit bf421d4

Browse files
icyflamejthoms1
icyflame
authored and
jthoms1
committed
chore(): get the proxy from a single function inside Utils instead of repeating code everywhere
1 parent 1a45500 commit bf421d4

File tree

8 files changed

+39
-22
lines changed

8 files changed

+39
-22
lines changed

‎lib/login.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Login.requestLogIn = function requestLogin(email, password, saveCookies) {
122122
username: email.toString(),
123123
password: password
124124
},
125-
proxy: process.env.PROXY || process.env.http_proxy || null
125+
proxy: Utils.getProxy()
126126
}, function(err, response) {
127127
if (err) {
128128
return q.reject('Error logging in: ' + err);
@@ -193,7 +193,7 @@ Login.getUserInfo = function getUserInfo(jar) {
193193
return c.key + '=' + encodeURIComponent(c.value);
194194
}).join('; ')
195195
},
196-
proxy: process.env.PROXY || process.env.http_proxy || null
196+
proxy: Utils.getProxy()
197197
}, function(err, response, body) {
198198
if (err) {
199199
return q.reject('Error logging in: ' + err);
@@ -228,7 +228,7 @@ Login.getUserApps = function getUserApps(jar) {
228228
return c.key + '=' + encodeURIComponent(c.value);
229229
}).join('; ')
230230
},
231-
proxy: process.env.PROXY || process.env.http_proxy || null
231+
proxy: Utils.getProxy()
232232
}, function(err, response, body) {
233233
if (err) {
234234
return q.reject('Error logging in: ' + err);
@@ -261,7 +261,7 @@ Login.getDownloadLink = function getDownloadLink(jar, appId) {
261261
return c.key + '=' + encodeURIComponent(c.value);
262262
}).join('; ')
263263
},
264-
proxy: process.env.PROXY || process.env.http_proxy || null
264+
proxy: Utils.getProxy()
265265
}, function(err, response, body) {
266266
if (err) {
267267
return q.reject('Error logging in: ' + err);

‎lib/package.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Package.listBuilds = function(appId, jar) {
6161
url: settings.IONIC_DASH_API + 'apps/' + appId + '/package/builds/',
6262
qs: { app_id: appId }, // eslint-disable-line camelcase
6363
useQuerystring: true,
64-
proxy: process.env.PROXY || process.env.http_proxy || null,
64+
proxy: Utils.getProxy(),
6565
headers: {
6666
cookie: jar.map(function(c) {
6767
return c.key + '=' + encodeURIComponent(c.value);
@@ -94,7 +94,7 @@ Package.getBuild = function(appId, jar, buildId, extraQueryParams) {
9494
url: settings.IONIC_DASH_API + 'apps/' + appId + '/package/builds/' + buildId,
9595
qs: _.extend({ app_id: appId }, extraQueryParams), // eslint-disable-line camelcase
9696
useQuerystring: true,
97-
proxy: process.env.PROXY || process.env.http_proxy || null,
97+
proxy: Utils.getProxy(),
9898
headers: {
9999
cookie: jar.map(function(c) {
100100
return c.key + '=' + encodeURIComponent(c.value);
@@ -325,7 +325,7 @@ function sendProjectZip(appId, jar) {
325325
url: settings.IONIC_DASH_API + 'apps/' + appId + '/package/projects/',
326326
qs: { app_id: appId }, // eslint-disable-line camelcase
327327
useQuerystring: true,
328-
proxy: process.env.PROXY || process.env.http_proxy || null,
328+
proxy: Utils.getProxy(),
329329
headers: {
330330
cookie: jar.map(function(c) {
331331
return c.key + '=' + encodeURIComponent(c.value);
@@ -360,7 +360,7 @@ function uploadProjectZip(url, formData, projectZipPath) {
360360
request.post({
361361
url: url,
362362
formData: formData,
363-
proxy: process.env.PROXY || process.env.http_proxy || null
363+
proxy: Utils.getProxy()
364364
}, function(err, response, body) {
365365
if (err) {
366366
log.error('Error:', err);
@@ -386,7 +386,7 @@ function sendToPackageService(appId, jar, formData) {
386386
qs: { app_id: appId }, // eslint-disable-line camelcase
387387
useQuerystring: true,
388388
formData: formData,
389-
proxy: process.env.PROXY || process.env.http_proxy || null,
389+
proxy: Utils.getProxy(),
390390
headers: {
391391
cookie: jar.map(function(c) {
392392
return c.key + '=' + encodeURIComponent(c.value);

‎lib/resources.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ function loadSourceImages() {
447447
image_id: sourceFile.imageId, // eslint-disable-line camelcase
448448
src: fs.createReadStream(sourceFile.filePath)
449449
},
450-
proxy: process.env.PROXY || null
450+
proxy: Utils.getProxy()
451451
};
452452

453453
request.post(postData, function(err, httpResponse, body) {
@@ -606,7 +606,7 @@ function generateResourceImage(image) {
606606
crop: 'center',
607607
encoding: 'png'
608608
},
609-
proxy: process.env.PROXY || null
609+
proxy: Utils.getProxy()
610610
};
611611

612612
var wr = fs.createWriteStream(image.tmpPath, { flags: 'w' });

‎lib/security.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Security.addProfile = function(appId, jar, name) {
1414

1515
// qs: {"app_id": appId},
1616
// useQuerystring: true,
17-
proxy: process.env.PROXY || process.env.http_proxy || null,
17+
proxy: Utils.getProxy(),
1818
formData: {
1919
name: name,
2020
tag: name.toLowerCase().replace(/\s/g, '_').replace(/[^a-z_]/g, '')
@@ -55,7 +55,7 @@ Security.listProfiles = function(appId, jar) {
5555

5656
// qs: {"app_id": appId},
5757
// useQuerystring: true,
58-
proxy: process.env.PROXY || process.env.http_proxy || null,
58+
proxy: Utils.getProxy(),
5959
headers: {
6060
cookie: jar.map(function(c) {
6161
return c.key + '=' + encodeURIComponent(c.value);
@@ -88,7 +88,7 @@ Security.getProfile = function(appId, jar, tag) {
8888

8989
// qs: {"app_id": appId},
9090
// useQuerystring: true,
91-
proxy: process.env.PROXY || process.env.http_proxy || null,
91+
proxy: Utils.getProxy(),
9292
headers: {
9393
cookie: jar.map(function(c) {
9494
return c.key + '=' + encodeURIComponent(c.value);
@@ -147,7 +147,7 @@ function sendCredentials(appId, jar, profileTag, formData) {
147147
// qs: {"app_id": appId},
148148
// useQuerystring: true,
149149
formData: formData,
150-
proxy: process.env.PROXY || process.env.http_proxy || null,
150+
proxy: Utils.getProxy(),
151151
headers: {
152152
cookie: jar.map(function(c) {
153153
return c.key + '=' + encodeURIComponent(c.value);

‎lib/start.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ Start.fetchCreatorApp = function(options) {
300300

301301
var q = Q.defer();
302302

303-
var proxy = process.env.PROXY || null;
303+
var proxy = Utils.getProxy();
304304

305305
request({ url: downloadUrl, proxy: proxy, encoding: null }, function(err, res, body) {
306306
if (!err && res && parseInt(res.statusCode, 10) === 200) {

‎lib/upload.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Upload.uploadToS3 = function uploadToS3(appDirectory, keyInfo) {
9494

9595
log.debug('Uploading zip file to S3');
9696

97-
var proxy = process.env.PROXY || process.env.HTTP_PROXY || null;
97+
var proxy = Utils.getProxy();
9898
var zipFile = path.join(appDirectory, TEMP_FILENAME);
9999

100100
// Now we upload with the signed URL the dash returned
@@ -130,7 +130,7 @@ Upload.signalDashUpload = function signalDashUpload(project, jar) {
130130

131131
log.debug('Signaling to ionic.io completion of the upload');
132132

133-
var proxy = process.env.PROXY || process.env.HTTP_PROXY || null;
133+
var proxy = Utils.getProxy();
134134

135135
// The final step is to signal the dash that the file was successfully uploaded
136136
request({
@@ -163,7 +163,7 @@ Upload.verify_tag = function verify_tag(project, jar, deploy, version) { // esli
163163

164164
if (deploy && version) {
165165

166-
var proxy = process.env.PROXY || process.env.HTTP_PROXY || null;
166+
var proxy = Utils.getProxy();
167167

168168
request({
169169
method: 'GET',
@@ -201,7 +201,7 @@ Upload.deploy = function deploy(project, jar, deploy) {
201201
if (deploy) {
202202
log.info('Deploying to channel: ' + deploy.channel.label.green.bold);
203203

204-
var proxy = process.env.PROXY || process.env.HTTP_PROXY || null;
204+
var proxy = Utils.getProxy();
205205

206206
var csrftoken = Utils.retrieveCsrfToken(jar);
207207

‎lib/utils.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@ Utils.retrieveCsrfToken = function retrieveCsrfToken(jar) {
3838
return csrftoken;
3939
};
4040

41+
/**
42+
* Utils.getProxy will return a string that represents a HTTP proxy server
43+
* setup by the user in their environment variables.
44+
*
45+
* No parameters are required
46+
* @return {String} or null if no proxy has been setup
47+
*/
48+
Utils.getProxy = function() {
49+
return process.env.PROXY || process.env.HTTP_PROXY || process.env.http_proxy || process.env.proxy || null;
50+
}
51+
4152
/**
4253
* Utils.createArchive will zip up a subdirectory in the app directory
4354
*
@@ -97,7 +108,7 @@ Utils.fetchArchive = function fetchArchive(targetPath, archiveUrl, isGui) {
97108
var tmpFolder = os.tmpdir();
98109
var tempZipFilePath = path.join(tmpFolder, 'ionic-starter-' + new Date().getTime() + '.zip');
99110

100-
var proxy = process.env.PROXY || process.env.http_proxy || null;
111+
var proxy = Utils.getProxy();
101112
var request = require('request');
102113
request({ url: archiveUrl, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
103114
if (err) {

‎spec/utils.spec.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Utils', function() {
1919

2020
it('should have methods defined', function() {
2121
var methods = ['transformCookies', 'retrieveCsrfToken', 'createArchive', 'fetchArchive',
22-
'preprocessOptions', 'getContentSrc', 'fail'];
22+
'preprocessOptions', 'getContentSrc', 'fail', 'getProxy'];
2323
methods.forEach(function(method) {
2424
expect(Utils[method]).toBeDefined();
2525
});
@@ -33,6 +33,12 @@ describe('Utils', function() {
3333
});
3434
});
3535

36+
describe('#getProxy', function() {
37+
it('should return null proxy if nothing is there in the env variable', function() {
38+
expect(Utils.getProxy()).toEqual(null);
39+
});
40+
});
41+
3642
describe('#createArchive', function() {
3743
it('should zip the contents and resolve', function(done) {
3844
spyOn(fs, 'existsSync').andReturn(true);

0 commit comments

Comments
 (0)