Merge pull request #404 from ttys0dev/fix-firefox-world

fix(background): use chrome.scripting.ExecutionWorld.MAIN for firefox compatibility
freelawproject · Oct 31, 2024 · 7d87622 · 7d87622
2 parents 95084d5 + 0618658
commit 7d87622
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,6 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         node-version: [14.x, 16.x, 18.x]
     steps:

diff --git a/CHANGES.md b/CHANGES.md
@@ -16,6 +16,7 @@ Fixes:
  - Improves the reliability of PACER case ID retrieval on attachment pages ([369](https://github.com/freelawproject/recap/issues/369), [400](https://github.com/freelawproject/recap-chrome/pull/400)).
  - Fix setDefaultOptions in updateToolbarButton([403](https://github.com/freelawproject/recap-chrome/pull/403))
  - Ensure we call sendResponse even when notifications are disabled([405](https://github.com/freelawproject/recap-chrome/pull/405))
+ - Use chrome.scripting.ExecutionWorld.MAIN for firefox compatibility ([404](https://github.com/freelawproject/recap-chrome/pull/404))
 
 
 For developers:

diff --git a/src/utils/background.js b/src/utils/background.js
@@ -1,5 +1,10 @@
 import { getCourtFromUrl } from './url_and_cookie_helpers.js';
 
+let isSafari =
+  /Safari/.test(navigator.userAgent) &&
+  !/Chrome|Chromium/.test(navigator.userAgent);
+let executionWorld = isSafari ? 'MAIN' : chrome.scripting.ExecutionWorld.MAIN;
+
 export function chooseVariant(details) {
   const options = ['A-A', 'A-C', 'B-B', 'B-D'];
   const randomIndex = Math.floor(Math.random() * options.length);
@@ -123,13 +128,12 @@ export function getAndStoreVueData(req, sender, sendResponse) {
     .executeScript({
       target: { tabId: sender.tab.id },
       func: getVueDiv,
-      world: 'MAIN',
+      world: executionWorld,
     })
     .then((injectionResults) => sendResponse(injectionResults));
 }
 
-
-export function overwriteSubmitMethod(req, sender, sendResponse){
+export function overwriteSubmitMethod(req, sender, sendResponse) {
   const _overwriteScript = () => {
     document.createElement('form').__proto__.submit = function () {
       this.id = 'form' + new Date().getTime();
@@ -154,7 +158,7 @@ export function overwriteSubmitMethod(req, sender, sendResponse){
     .executeScript({
       target: { tabId: sender.tab.id },
       func: _overwriteScript,
-      world: 'MAIN',
+      world: executionWorld,
     })
     .then((injectionResults) => sendResponse(injectionResults));
 }