chore(): handle un-common start_url

Author: jgw96

lib/manifestTools/manifestValidator.js

@@ -1,21 +1,21 @@
 'use strict';
 
 var path = require('path'),
-    fs = require('fs'),
-    Q = require('q'),
-    url = require('url');
+  fs = require('fs'),
+  Q = require('q'),
+  url = require('url');
 
 var constants = require('../constants'),
-    log = require('../log'),
-    platformTools = require('../platformTools'),
-    utils = require('../utils');
+  log = require('../log'),
+  platformTools = require('../platformTools'),
+  utils = require('../utils');
 
 var toStringFunction = Object.prototype.toString;
 
 // load the rule(s) from a folder or file
 function loadValidationRules(fileOrDir, platforms, callback) {
 
-  var stat = Q.nfbind(fs.stat); 
+  var stat = Q.nfbind(fs.stat);
 
   // list contents of the validation rules folder
   return Q.nfcall(fs.readdir, fileOrDir).then(function (files) {
@@ -26,13 +26,13 @@ function loadValidationRules(fileOrDir, platforms, callback) {
         if (info.isDirectory()) {
           // ignore any directory that doesn't  match one of the requested platforms 
           if (platforms.indexOf(file) < 0) {
-              return Q.resolve();
+            return Q.resolve();
           }
-          
+
           // process the rules in the platform folder
           return loadValidationRules(filePath, []);
         }
-        
+
         // load the rules defined in the file
         var rulePath = path.join(fileOrDir, file);
         try {
@@ -44,40 +44,40 @@ function loadValidationRules(fileOrDir, platforms, callback) {
         }
       });
     }))
-    .then (function (results) {
-      // verify the results and consolidate the loaded rules  
-      return results.reduce(function (validationRules, result) {
-        if (result.state === 'fulfilled') {
-          if (result.value) {
-            if (Array.isArray(result.value)) {
-              validationRules.push.apply(validationRules, result.value);
+      .then(function (results) {
+        // verify the results and consolidate the loaded rules  
+        return results.reduce(function (validationRules, result) {
+          if (result.state === 'fulfilled') {
+            if (result.value) {
+              if (Array.isArray(result.value)) {
+                validationRules.push.apply(validationRules, result.value);
+              }
+              else {
+                validationRules.push(result.value);
+              }
             }
-            else {
-              validationRules.push(result.value);            
-            }              
-          }            
-        }
-        else {
-          log.error(result.reason.getMessage());
-        }
-        
-        return validationRules;
-      }, []);
-    });
-  })
-  .catch (function (err) {
-    if (err.code !== 'ENOTDIR') {
-      throw err;
-    }
-    
-    // fileOrDir is a file
-    var rules = require(fileOrDir);
-    return Array.isArray(rules) ? rules : [rules];
-  })  
-  .catch(function (err) {
-    return Q.reject(new Error('Failed to read validation rules from the specified location: \'' + fileOrDir + '\'. ' + err.message + '.'));
+          }
+          else {
+            log.error(result.reason.getMessage());
+          }
+
+          return validationRules;
+        }, []);
+      });
   })
-  .nodeify(callback);
+    .catch(function (err) {
+      if (err.code !== 'ENOTDIR') {
+        throw err;
+      }
+
+      // fileOrDir is a file
+      var rules = require(fileOrDir);
+      return Array.isArray(rules) ? rules : [rules];
+    })
+    .catch(function (err) {
+      return Q.reject(new Error('Failed to read validation rules from the specified location: \'' + fileOrDir + '\'. ' + err.message + '.'));
+    })
+    .nodeify(callback);
 }
 
 function runValidationRules(w3cManifestInfo, rules, callback) {
@@ -135,7 +135,7 @@ function applyValidationRules(w3cManifestInfo, platformModules, platforms) {
 
     return Q.allSettled(platformTasks);
   }
-  
+
   // Only run the "All Platform" validations for W3C manifests
   if (w3cManifestInfo.format === constants.BASE_MANIFEST_FORMAT) {
     return validateAllPlatforms()
@@ -160,12 +160,12 @@ function validateManifest(w3cManifestInfo, platforms, callback) {
   return platformTools.loadPlatforms(platforms).then(function (platformModules) {
     return applyValidationRules(w3cManifestInfo, platformModules, platforms);
   })
-  .nodeify(callback);    
+    .nodeify(callback);
 }
 
 function imageValidation(manifestContent, description, platform, level, requiredIconSizes, callback) {
   var icons = manifestContent.icons;
-  
+
   var result = {
     description: description,
     platform: platform,
@@ -208,7 +208,7 @@ function imageValidation(manifestContent, description, platform, level, required
 
 function imageGroupValidation(manifestContent, description, platform, validIconSizes, callback) {
   var icons = manifestContent.icons;
-  
+
   var result = {
     description: description,
     platform: platform,
@@ -239,38 +239,43 @@ function validateAndNormalizeStartUrl(siteUrl, manifestInfo, callback) {
   if (manifestInfo.format !== constants.BASE_MANIFEST_FORMAT) {
     return callback(new Error('The manifest found is not a W3C manifest.'), manifestInfo);
   }
-  
+
   if (manifestInfo.content.start_url) {
     if (!utils.isURL(manifestInfo.content.start_url)) {
       return callback(new Error('The manifest\'s start_url member is not a valid URL: \'' + manifestInfo.content.start_url + '\''), manifestInfo);
     }
   } else {
     manifestInfo.content.start_url = '/';
   }
-  
+
   if (siteUrl) {
     if (!utils.isURL(siteUrl)) {
       return callback(new Error('The site URL is not a valid URL: \'' + siteUrl + '\''), manifestInfo);
     }
-    
+
     var parsedSiteUrl = url.parse(siteUrl);
     var parsedManifestStartUrl = url.parse(manifestInfo.content.start_url);
     if (parsedManifestStartUrl.hostname && parsedSiteUrl.hostname !== parsedManifestStartUrl.hostname) {
-       // issue #88 - bis
+      // issue #88 - bis
       var subDomainOfManifestStartUrlSplitted = parsedManifestStartUrl.hostname.split('.');
       var lengthSubDomain = subDomainOfManifestStartUrlSplitted.length;
       var subDomainOfManifestStartUrl = null;
-      if(lengthSubDomain >= 2){
-        subDomainOfManifestStartUrl = 
-        subDomainOfManifestStartUrlSplitted[lengthSubDomain - 2] + '.' + subDomainOfManifestStartUrlSplitted[lengthSubDomain - 1];
+      if (lengthSubDomain >= 2) {
+        subDomainOfManifestStartUrl =
+          subDomainOfManifestStartUrlSplitted[lengthSubDomain - 2] + '.' + subDomainOfManifestStartUrlSplitted[lengthSubDomain - 1];
       }
-      if(!subDomainOfManifestStartUrl || !utils.isURL(subDomainOfManifestStartUrl) || parsedSiteUrl.hostname.toLowerCase() !== subDomainOfManifestStartUrl.toLowerCase()){
+      if (!subDomainOfManifestStartUrl || !utils.isURL(subDomainOfManifestStartUrl) || parsedSiteUrl.hostname.toLowerCase() !== subDomainOfManifestStartUrl.toLowerCase()) {
         return callback(new Error('The domain of the hosted site (' + parsedSiteUrl.hostname + ') does not match the domain of the manifest\'s start_url member (' + parsedManifestStartUrl.hostname + ')'), manifestInfo);
       }
     }
-    
-    manifestInfo.content.start_url = url.resolve(siteUrl, manifestInfo.content.start_url);
-    
+
+    if (parsedManifestStartUrl.search !== null) {
+      manifestInfo.content.start_url = siteUrl.split('?')[0];
+    }
+    else {
+      manifestInfo.content.start_url = url.resolve(siteUrl, manifestInfo.content.start_url);
+    }
+
     manifestInfo.default = { short_name: utils.getDefaultShortName(siteUrl) };
   }