Merge pull request #115 from rodolfomiranda/firefox

Support for firefox
WebOfTrust · Feb 29, 2024 · b0ecc85 · b0ecc85
2 parents 569db83 + 05974fc
commit b0ecc85
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/pages/background/utils.ts b/src/pages/background/utils.ts
@@ -1,7 +1,7 @@
 export const senderIsPopup = (sender: chrome.runtime.MessageSender) => {
-  const origin = "chrome-extension://" + chrome.runtime.id;
-  const popupPath = origin + "/src/pages/popup/index.html";
-  return sender.origin === origin && sender.url === popupPath;
+  return ((sender.url?.startsWith('moz-extension://') || sender.url?.startsWith('chrome-extension://'))&& 
+    sender.url?.endsWith('/src/pages/popup/index.html') && 
+    sender.id === chrome.runtime.id);
 };
 
 export const isValidUrl = (str: string) => {

diff --git a/src/pages/content/index.tsx b/src/pages/content/index.tsx
@@ -52,7 +52,6 @@ window.addEventListener(
           });
 
           let filteredSignins: any[] = [];
-          console.log(event.data.type);
           tabSigninResp?.data?.signins.forEach((signin: any) => {
             if (
               signin.identifier &&
@@ -98,7 +97,8 @@ chrome.runtime.onMessage.addListener(async function (
   sender,
   sendResponse
 ) {
-  if (sender.origin === "chrome-extension://" + chrome.runtime.id) {
+  if ((sender.url?.startsWith("moz-extension://") || sender.origin?.startsWith("chrome-extension://")) && 
+    sender.id === chrome.runtime.id) {
     console.log(
       "Message received from browser extension: " +
         message.type +
@@ -135,7 +135,12 @@ chrome.runtime.onMessage.addListener(async function (
     }
 
     if (message.type === "tab" && message.subtype === "get-tab-state") {
-      sendResponse({ data: { appState: getTabState() } });
+      if (sender.origin?.startsWith("chrome-extension://")){
+        sendResponse({ data: { appState: getTabState() } });
+      } else {
+        return Promise.resolve({ data: { appState: getTabState() } })
+      }
+
     }
 
     if (message.type === "tab" && message.subtype === "set-tab-state") {

diff --git a/src/pages/popup/Popup.tsx b/src/pages/popup/Popup.tsx
@@ -65,7 +65,6 @@ export default function Popup(): JSX.Element {
     if (data.isConnected) {
       chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
         if (tabs.length === 1) {
-          console.log("realoading tab");
           chrome.tabs.sendMessage(tabs[0].id!, {
             type: "tab",
             subtype: "reload-state",

diff --git a/src/pages/popup/index.tsx b/src/pages/popup/index.tsx
@@ -14,11 +14,9 @@ function init() {
     sender,
     sendResponse
   ) {
-    if (
-      sender.url ===
-        "chrome-extension://" +
-          chrome.runtime.id +
-          "/service-worker-loader.js" &&
+    if ((sender.url?.startsWith('moz-extension://') || sender.url?.startsWith('chrome-extension://')) && 
+      sender.url?.endsWith('/service-worker-loader.js') && 
+      sender.id === chrome.runtime.id &&
       request.type === "popup" &&
       request.subtype === "isOpened"
     ) {