Merge pull request #80 from pwa-builder/redirect_all

Issue 1064 - Enable multiple redirects

Author: JudahGabriel

lib/manifestTools/manifestLoader.js

@@ -40,12 +40,13 @@ function listAvailableManifestFormats() {
 
 function fetchManifestUrlFromSite (siteUrl, callback) {
   var deferred = Q.defer();
-  request({ uri: siteUrl }, function (err, response, body) {
+  request({ uri: siteUrl, followAllRedirects: true }, function (err, response, body) {
     if (err || response.statusCode !== 200) {
       return deferred.reject(new Error('Failed to retrieve manifest from site.'));
     }
 
     var $ = cheerio.load(body);
+    // Why this this marked as a space separated list of values
     var manifestUrl = $('link[rel~="manifest"]').attr('href');
     if (manifestUrl) {
       var parsedManifestUrl = url.parse(manifestUrl);
@@ -114,7 +115,7 @@ function downloadManifestFromUrl (manifestUrl, manifestFormat, callback) {
   }
 
   var deferred = Q.defer();
-  request({ uri: manifestUrl }, function (err, response, data) {
+  request({ uri: manifestUrl, followAllRedirects: true }, function (err, response, data) {
     if (err || response.statusCode !== 200) {
       return deferred.reject(new Error('Failed to download manifest data.'));
     }

lib/manifestTools/validationRules/httpsUrlRequired.js

@@ -15,7 +15,7 @@ module.exports = function (manifestContent, callback) {
       return callback();
     } else {
       // check if the site is redirected to https
-      request({ uri: startUrl }, function (err, response) {
+      request({ uri: startUrl, followAllRedirects: true }, function (err, response) {
         if (!err && response && response.request && response.request.uri && response.request.uri.href) {
           var parsedLocationUrl = url.parse(response.request.uri.href);
           if (parsedLocationUrl.protocol && parsedLocationUrl.protocol.match(/^https:?/gi)) {

lib/serviceWorkerTools.js

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pwabuilder-lib",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "PWA Builder Core Library",
   "repository": {
     "type": "git",