Use cookies, correct behavior on redirect

Author: s0ph1e

lib/load.js

@@ -73,22 +73,26 @@ var Loader = function (data) {
     return processingFunction;
   }
 
-  function loadFromUrl(url, desiredFilename) {
-    var localFilename = getLoadedFilename(url);
+  function loadFromUrl(options) {
+    var localFilename = getLoadedFilename(options.url);
     var fileProcessingFunction;
 
     if (!localFilename) {
       // Get filename
-      localFilename = getFilename(desiredFilename || path.basename(url));
-      // Get processing function for file
-      fileProcessingFunction = getFileProcessingFunction(url, localFilename);
+      localFilename = getFilename(options.filename || path.basename(options.url));
       // Set file as loaded
-      setLoadedFilename(url, localFilename);
+      setLoadedFilename(options.url, localFilename);
+
       // Request -> processing -> save to fs
-      return utils.makeRequest(url).then(fileProcessingFunction).then(function saveFileToFS(text) {
+      return utils.makeRequest(options.url).then(function requestCompleted(data) {
+        options.url = data.url; // Url may be changed in redirects
+        fileProcessingFunction = getFileProcessingFunction(options.url, localFilename);
+
+        return fileProcessingFunction(data.body);
+      }).then(function saveFileToFS(text) {
         return fs.outputFileAsync(localFilename, text, {encoding: 'binary'});
       }).then(function fileSavedToFS() {
-        logger.log(url + ' -> ' + localFilename);
+        logger.log(options.url + ' -> ' + localFilename);
         return localFilename;
       });
     }
@@ -148,8 +152,10 @@ var Loader = function (data) {
       var attr = self.attr(attribute);
 
       if (attr) {
-        var htmlSourceUrl = utils.getUrl(htmlUrl, attr);
-        return loadFromUrl(htmlSourceUrl).then(function loadedHtmlSourceFileFromUrl(htmlSourceLocalPath) {
+        var loadOptions = {
+          url: utils.getUrl(htmlUrl, attr)
+        };
+        return loadFromUrl(loadOptions).then(function loadedHtmlSourceFileFromUrl(htmlSourceLocalPath) {
           var srcRelativePath = utils.getUnixPath(path.relative(htmlDirectoryPath, htmlSourceLocalPath));
           self.attr(attribute, srcRelativePath);
           return Promise.resolve();
@@ -167,9 +173,11 @@ var Loader = function (data) {
   function loadCssSources(cssUrl, cssLocalPath, text) {
     var cssDirectoryPath = path.dirname(cssLocalPath);
     var cssSourcesPromises = _.map(css.getSourcesPaths(text), function loadCssSourceFile(cssSourcePath) {
-      var cssSourceUrl = utils.getUrl(cssUrl, cssSourcePath);
+      var loadOptions = {
+        url: utils.getUrl(cssUrl, cssSourcePath)
+      };
 
-      return loadFromUrl(cssSourceUrl).then(function loadedCssSourceFileFromUrl(cssSourceLocalPath) {
+      return loadFromUrl(loadOptions).then(function loadedCssSourceFileFromUrl(cssSourceLocalPath) {
         var srcRelativePath = utils.getUnixPath(path.relative(cssDirectoryPath, cssSourceLocalPath));
         text = text.replace(new RegExp(cssSourcePath, 'g'), srcRelativePath);
         return Promise.resolve();
@@ -222,7 +230,7 @@ var Loader = function (data) {
 
   function load(loadOptions) {
     return Promise.reduce(loadOptions, function (result, currentOptions) {
-      return loadFromUrl(currentOptions.url, currentOptions.filename).then(function htmlLoaded(filename) {
+      return loadFromUrl(currentOptions).then(function htmlLoaded(filename) {
         result.push({
           url: currentOptions.url,
           filename: filename

lib/utils/utils.js

@@ -30,14 +30,18 @@ function makeRequest(url) {
     url: url,
     method: 'GET',
     encoding: 'binary',
-    strictSSL: false
-  }).then(function (response) {
-    return response[1];
+    strictSSL: false,
+    jar: true
+  }).then(function (data) {
+      return {
+        url: data[0].request.href,
+        body: data[0].body
+      }
   });
 }
 
 module.exports.isUrl = isUrl;
 module.exports.getUrl = getUrl;
 module.exports.getUnixPath = getUnixPath;
 module.exports.trimFilename = trimFilename;
-module.exports.makeRequest = makeRequest;
+module.exports.makeRequest = makeRequest;