feat: fix the bug of pr GoogleChrome#9170

kkdev163 · Jul 31, 2019 · b22bce2 · b22bce2
1 parent 97ec8d6
commit b22bce2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lighthouse-cli/bin.js b/lighthouse-cli/bin.js
@@ -128,7 +128,12 @@ async function begin() {
     // the conversion here, but long term either the CLI flag or the setting should have
     // a different name.
     // @ts-ignore
-    const extraCookiesStr = /** @type {string} */ (cliFlags.extraCookies);
+    let extraCookiesStr = /** @type {string} */ (cliFlags.extraCookies);
+    // If not a JSON object, assume it's a path to a JSON file.
+    if (extraCookiesStr.substr(0, 1) !== '{') {
+      extraCookiesStr = fs.readFileSync(extraCookiesStr, 'utf-8');
+    }
+
     cliFlags.extraCookies = JSON.parse(extraCookiesStr);
     if (!Array.isArray(cliFlags.extraCookies)) {
       throw new Error('extraCookies parameter must be a valid JSON array');

diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
@@ -266,7 +266,7 @@ class GatherRunner {
       return;
     }
     extraCookies.forEach(cookie => {
-      if (!cookie.url || !cookie.domain) {
+      if (!cookie.url && !cookie.domain) {
         // Default cookie URL to to current URL, if neither domain nor url is specified
         cookie.url = passContext.url;
       }