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

Commit 76af390

Browse files
committed
adding redirect helper to request... should move away from this
1 parent db80815 commit 76af390

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

lib/manifestTools/manifestLoader.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ function listAvailableManifestFormats() {
4040

4141
function fetchManifestUrlFromSite (siteUrl, callback) {
4242
var deferred = Q.defer();
43-
request({ uri: siteUrl }, function (err, response, body) {
43+
request({ uri: siteUrl, followAllRedirects: true }, function (err, response, body) {
4444
if (err || response.statusCode !== 200) {
4545
return deferred.reject(new Error('Failed to retrieve manifest from site.'));
4646
}
4747

4848
var $ = cheerio.load(body);
49+
// Why this this marked as a space separated list of values
4950
var manifestUrl = $('link[rel~="manifest"]').attr('href');
5051
if (manifestUrl) {
5152
var parsedManifestUrl = url.parse(manifestUrl);
@@ -114,7 +115,7 @@ function downloadManifestFromUrl (manifestUrl, manifestFormat, callback) {
114115
}
115116

116117
var deferred = Q.defer();
117-
request({ uri: manifestUrl }, function (err, response, data) {
118+
request({ uri: manifestUrl, followAllRedirects: true }, function (err, response, data) {
118119
if (err || response.statusCode !== 200) {
119120
return deferred.reject(new Error('Failed to download manifest data.'));
120121
}

lib/manifestTools/validationRules/httpsUrlRequired.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = function (manifestContent, callback) {
1515
return callback();
1616
} else {
1717
// check if the site is redirected to https
18-
request({ uri: startUrl }, function (err, response) {
18+
request({ uri: startUrl, followAllRedirects: true }, function (err, response) {
1919
if (!err && response && response.request && response.request.uri && response.request.uri.href) {
2020
var parsedLocationUrl = url.parse(response.request.uri.href);
2121
if (parsedLocationUrl.protocol && parsedLocationUrl.protocol.match(/^https:?/gi)) {

lib/serviceWorkerTools.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function getServiceWorkersDescription(callback) {
1919

2020
function getServiceWorkersFromUrl (siteUrl, callback) {
2121
var deferred = Q.defer();
22-
request({ uri: siteUrl }, function (err, response, body) {
22+
request({ uri: siteUrl, followAllRedirects: true }, function (err, response, body) {
2323
if (err || response.statusCode !== 200) {
2424
return deferred.reject(new Error('Failed to retrieve service workers from site.'));
2525
}

0 commit comments

Comments
 (0)