browser extension: finish migrating Chrome to manifest v3

snarfed · snarfed · commit 755bf410757d · 2022-09-17T20:42:00.000-07:00
diff --git a/README.md b/README.md
@@ -133,9 +133,10 @@ Here's how to send them in with a bug report:
 
 Browser extension: release
 ---
-Here's how to cut a new release of the browser extension and publish it [to addons.mozilla.org](https://addons.mozilla.org/en-US/firefox/addon/bridgy/) and [to the Chrome Web Store](https://chrome.google.com/webstore/detail/bridgy/lcpeamdhminbbjdfjbpmhgjgliaknflj):
+Here's how to cut a new release of the browser extension and publish it [to addons.mozilla.org](https://addons.mozilla.org/en-US/firefox/addon/bridgy/):
 
-1. Load the extension in Firefox (`about:debugging`) and Chrome (`chrome://extensions/`, Developer mode on). Check that it works in both.
+1. `ln -fs manifest.firefox.json manifest.json`
+1. Load the extension in Firefox (`about:debugging`). Check that it works.
 1. Bump the version in `browser-extension/manifest.json`.
 1. Update the Changelog in the README.md section below this one.
 1. Build and sign the artifact:
@@ -156,21 +157,25 @@ Here's how to cut a new release of the browser extension and publish it [to addo
     ...
     ```
     It's usually auto-approved within minutes. [Check the public listing here.](https://addons.mozilla.org/en-US/firefox/addon/bridgy/)
-1. Submit it to the Chrome Web Store:
-    1. [Open the console.](https://chrome.google.com/webstore/devconsole/)
-    1. Open the Bridgy item. Ryan to add you if you don't see it.
-    1. Choose _Package_ on the left.
-    1. Click the _Upload new package_ button.
-    1. Upload the new version's zip file from `browser-extension/web-ext-artifacts/`.
-    1. Update the Changelog in the _Description_ box. Leave the rest unchanged.
-    1. Click _Save draft_, then _Submit for review_.
+
+Here's how to publish it [to the Chrome Web Store](https://chrome.google.com/webstore/detail/bridgy/lcpeamdhminbbjdfjbpmhgjgliaknflj):
+
+1. `ln -fs manifest.chrome.json manifest.json`
+1. Load the extension in Chrome (`chrome://extensions/`, Developer mode on). Check that it works.
+1. [Open the console.](https://chrome.google.com/webstore/devconsole/)
+1. Open the Bridgy item. Ryan to add you if you don't see it.
+1. Choose _Package_ on the left.
+1. Click the _Upload new package_ button.
+1. Upload the new version's zip file from `browser-extension/web-ext-artifacts/`.
+1. Update the Changelog in the _Description_ box. Leave the rest unchanged.
+1. Click _Save draft_, then _Submit for review_.
 
 
 Browser extension: Changelog
 ---
-0.6, unreleased
+0.6.0, 2022-09-17
 
-* [Migrate from Manifest v2 to v3.](https://developer.chrome.com/docs/extensions/mv3/intro/mv3-migration/#man-sw) ([Ugh.](https://blog.mozilla.org/addons/2022/05/18/manifest-v3-in-firefox-recap-next-steps/))
+* Migrate Chrome ([but not Firefox](https://blog.mozilla.org/addons/2022/05/18/manifest-v3-in-firefox-recap-next-steps/)) [from Manifest v2 to v3](https://developer.chrome.com/docs/extensions/mv3/intro/mv3-migration/#man-sw).
 
 0.5, 2022-07-21
 
diff --git a/browser-extension/common.js b/browser-extension/common.js
@@ -312,8 +312,18 @@ class Silo {
    * @returns {String} Response body from the silo
    */
   static async siloGet(url) {
-    // Set up cookies. Can't use credentials: include in the fetch API because
-    // it requires the server to support CORS, with only some values for
+    // Set up cookies. Distinguish between browsers by checking for webRequest.
+    //
+    // Chrome with manifest v3
+    // ===
+    // We extract cookies and pass the Cookie header to fetch() directly. Didn't
+    // work in manifest v2, but does work in v3. Requires the cookies permission
+    // and instagram.com and facebook.com in host_permissions.
+    //
+    // Firefox with manifest v2
+    // ===
+    // Can't use credentials: include in the fetch API because it requires the
+    // server to support CORS, with only some values for
     // Access-Control-Allow-Origin, specifically not *, and it also doesn't work
     // with Firefox Container Tabs.
     // https://zellwk.com/blog/handling-cookies-with-fetchs-credentials/
@@ -337,7 +347,7 @@ class Silo {
     }
 
     const inject = this.injectCookies(cookies)
-    if (!browser.webRequest.onBeforeSendHeaders.hasListener(inject)) {
+    if (browser.webRequest && !browser.webRequest.onBeforeSendHeaders.hasListener(inject)) {
       browser.webRequest.onBeforeSendHeaders.addListener(
         inject,
         {urls: [`*://*.${this.DOMAIN}/*`]},
@@ -359,7 +369,7 @@ class Silo {
 
     // Make HTTP request
     console.debug(`Fetching ${url}`)
-    const headers = {'X-Bridgy': '1'}
+    const headers = browser.webRequest ? {'X-Bridgy': '1'} : {'Cookie': cookies}
     Object.assign(headers, this.headers())
     const res = await fetch(url, {
       method: 'GET',
diff --git a/browser-extension/manifest.chrome.json b/browser-extension/manifest.chrome.json
@@ -4,14 +4,11 @@
 	"description": "Bridgy connects your web site to social media. This extension adds Facebook and Instagram support.",
 	"homepage_url": "https://brid.gy/",
     "manifest_version": 3,
-    "minimum_chrome_version": "74",
+    "minimum_chrome_version": "88",
     "permissions": [
         "alarms",
-        "contextualIdentities",
         "cookies",
-        "storage",
-        "webRequest",
-        "webRequestBlocking"
+        "storage"
     ],
     "host_permissions": [
         "*://*.brid.gy/*",
diff --git a/browser-extension/manifest.firefox.v3.json b/browser-extension/manifest.firefox.v3.json
@@ -0,0 +1,36 @@
+{
+	"name": "Bridgy",
+	"version": "0.6.0",
+	"description": "Bridgy connects your web site to social media. This extension adds Facebook and Instagram support.",
+	"homepage_url": "https://brid.gy/",
+    "manifest_version": 3,
+    "minimum_chrome_version": "74",
+    "applications": {
+        "gecko": {
+            "id": "bridgy2@snarfed.org",
+            "strict_min_version": "67.0"
+        }
+    },
+    "permissions": [
+        "alarms",
+        "contextualIdentities",
+        "cookies",
+        "storage"
+    ],
+    "host_permissions": [
+        "*://*.brid.gy/*",
+        "*://*.instagram.com/*",
+        "*://*.facebook.com/*"
+    ],
+    "background": {
+        "page": "background.html"
+    },
+    "icons": {
+        "128": "bridgy_logo_128.jpg",
+        "1024": "bridgy_logo_square_1024.jpg"
+    },
+    "options_ui": {
+        "page": "options.html",
+        "browser_style": true
+    }
+}
diff --git a/browser-extension/manifest.json b/browser-extension/manifest.json
@@ -0,0 +1 @@
+manifest.firefox.v3.json
