From cd4131b5bf0e511172b2b71f1ccebf030f5e1ae3 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Thu, 21 Dec 2017 15:18:26 -0800
Subject: [PATCH] Bug 1425267 fix url param schema for launchWebAuthFlow, r=rpl

---
 toolkit/components/extensions/schemas/identity.json      | 4 ++--
 .../extensions/test/mochitest/test_ext_identity.html     | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/extensions/schemas/identity.json b/toolkit/components/extensions/schemas/identity.json
index 308687ce8c83..97b8a57f379c 100644
--- a/toolkit/components/extensions/schemas/identity.json
+++ b/toolkit/components/extensions/schemas/identity.json
@@ -162,7 +162,7 @@
             "name": "details",
             "type": "object",
             "properties": {
-              "url": {"type": "string"},
+              "url": {"$ref": "manifest.HttpURL"},
               "interactive": {"type": "boolean", "optional": true}
             }
           },
@@ -185,7 +185,7 @@
         "description": "Generates a redirect URL to be used in |launchWebAuthFlow|.",
         "parameters": [
           {
-            "name": " path",
+            "name": "path",
             "type": "string",
             "default": "",
             "optional": true,
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_identity.html b/toolkit/components/extensions/test/mochitest/test_ext_identity.html
index 90873e01be07..2ffa68c15dea 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_identity.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_identity.html
@@ -77,8 +77,13 @@ add_task(async function test_badAuthURI() {
       ],
     },
     async background() {
-      await browser.test.assertRejects(browser.identity.launchWebAuthFlow({interactive: true, url: "foobar"}),
-                                       "details.url is invalid", "invalid param url");
+      for (let url of ["foobar", "about:addons", "about:blank", "ftp://example.com/test"]) {
+        await browser.test.assertThrows(
+          () => { browser.identity.launchWebAuthFlow({interactive: true, url}); },
+          /Type error for parameter details/,
+          "details.url is invalid");
+      }
+
       browser.test.sendMessage("done");
     },
   });