From d6f94381305165b7d994ae7eee5e8ff495f1ba90 Mon Sep 17 00:00:00 2001
From: Thomas Prouvot <35368290+tprouvot@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:35:38 +0200
Subject: [PATCH] [general] Fix hardcoded browser in generate token url (#139)

---
 CHANGES.md     | 1 +
 addon/popup.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4683a76e..5951cf26 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## General
 
+- Fix hardcoded browser in Generate Token url [issue 137](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/137) (issue by [kkorynta](https://github.com/kkorynta))
 - Add "Create New Flow" shortcut
 - Update pop-up release note link to github pages
 - Detect SObject on listview page [feature 121](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/121) (idea by [Mehdi Cherfaoui](https://github.com/mehdisfdc))
diff --git a/addon/popup.js b/addon/popup.js
index 496d5b3b..e12dc1c6 100644
--- a/addon/popup.js
+++ b/addon/popup.js
@@ -144,6 +144,7 @@ class App extends React.PureComponent {
     hostArg.set("host", sfHost);
     let linkInNewTab = localStorage.getItem("openLinksInNewTab");
     let linkTarget = inDevConsole || linkInNewTab ? "_blank" : "_top";
+    let browser = navigator.userAgent.includes("Chrome") ? "chrome" : "moz";
     return (
       h("div", {},
         h("div", { className: "slds-grid slds-theme_shade slds-p-vertical_x-small slds-border_bottom" },
@@ -188,7 +189,7 @@ class App extends React.PureComponent {
               h("a",
                 {
                   ref: "generateToken",
-                  href: `https://${sfHost}/services/oauth2/authorize?response_type=token&client_id=` + clientId + "&redirect_uri=chrome-extension://" + chrome.runtime.id + "/data-export.html?host=" + sfHost + "%26",
+                  href: `https://${sfHost}/services/oauth2/authorize?response_type=token&client_id=` + clientId + "&redirect_uri=" + browser + "-extension://" + chrome.runtime.id + "/data-export.html?host=" + sfHost + "%26",
                   target: linkTarget,
                   className: !clientId ? "button hide" : "page-button slds-button slds-button_neutral"
                 },