isFirefox

Author: rebornix

src/background.ts

@@ -12,7 +12,7 @@ import { getSiteName, getMatchedEntries } from "./utils";
 import { CodeState } from "./models/otp";
 
 import { getOTPAuthPerLineFromOPTAuthMigration } from "./models/migration";
-import { isChrome } from "./browser";
+import { isChrome, isFirefox } from "./browser";
 
 let cachedPassphrase = "";
 let autolockTimeout: number;
@@ -319,7 +319,7 @@ function getBackupToken(service: string) {
     } else if (service === "drive") {
       if (navigator.userAgent.indexOf("Edg") !== -1) {
         redirUrl = encodeURIComponent("https://authenticator.cc/oauth-edge");
-      } else if (navigator.userAgent.indexOf("Firefox") !== -1) {
+      } else if (isFirefox) {
         redirUrl = encodeURIComponent(chrome.identity.getRedirectURL());
       } else {
         redirUrl = encodeURIComponent("https://authenticator.cc/oauth");
@@ -660,7 +660,7 @@ function updateContextMenu() {
                   encodeURIComponent(tab.title);
               }
               let windowType;
-              if (navigator.userAgent.indexOf("Firefox") !== -1) {
+              if (isFirefox) {
                 windowType = "detached_panel";
               } else {
                 windowType = "panel";

src/browser.ts

@@ -2,6 +2,7 @@ const userAgent = navigator.userAgent;
 
 export const isFirefox = (userAgent.indexOf('Firefox') >= 0);
 export const isWebKit = (userAgent.indexOf('AppleWebKit') >= 0);
+export const isEdge = navigator.userAgent.indexOf("Edg") !== -1);
 export const isChromium = (userAgent.indexOf('Chrome') >= 0);
 export const isSafari = (!isChromium && (userAgent.indexOf('Safari') >= 0));
 export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1 && navigator.userAgent.indexOf("Edg") === -1;

src/components/Popup/MainHeader.vue

@@ -84,6 +84,7 @@ import IconScan from "../../../svg/scan.svg";
 import IconPencil from "../../../svg/pencil.svg";
 import IconCheck from "../../../svg/check.svg";
 import IconPlus from "../../../svg/plus.svg";
+import { isFirefox } from "../../browser";
 
 const computedPrototype = [
   mapState("style", ["style"]),
@@ -106,7 +107,7 @@ export default Vue.extend({
     },
     popOut() {
       let windowType;
-      if (navigator.userAgent.indexOf("Firefox") !== -1) {
+      if (isFirefox) {
         windowType = "detached_panel";
       } else {
         windowType = "panel";
@@ -152,7 +153,7 @@ export default Vue.extend({
         return;
       }
       // Request permissions
-      if (navigator.userAgent.indexOf("Firefox") !== -1) {
+      if (isFirefox) {
         await new Promise((resolve: (value: void) => void) => {
           chrome.permissions.request(
             { origins: ["<all_urls>"] },

src/components/Popup/MenuPage.vue

@@ -83,6 +83,7 @@ import IconComments from "../../../svg/comments.svg";
 import IconGlobe from "../../../svg/globe.svg";
 import IconCode from "../../../svg/code.svg";
 import IconClipboardCheck from "../../../svg/clipboard-check.svg";
+import { isFirefox } from "../../browser";
 
 export default Vue.extend({
   components: {
@@ -111,7 +112,7 @@ export default Vue.extend({
     openHelp() {
       let url = "https://otp.ee/chromeissues";
 
-      if (navigator.userAgent.indexOf("Firefox") !== -1) {
+      if (isFirefox) {
         url = "https://otp.ee/firefoxissues";
       } else if (navigator.userAgent.indexOf("Edg") !== -1) {
         url = "https://otp.ee/edgeissues";

src/components/Popup/PreferencesPage.vue

@@ -61,6 +61,7 @@
 </template>
 <script lang="ts">
 import Vue from "vue";
+import { isFirefox } from "../../browser";
 
 export default Vue.extend({
   computed: {
@@ -136,7 +137,7 @@ export default Vue.extend({
     },
     isFirefox: {
       get(): boolean {
-        return navigator.userAgent.indexOf("Firefox") !== -1;
+        return isFirefox;
       },
     },
   },
@@ -149,7 +150,7 @@ export default Vue.extend({
   methods: {
     popOut() {
       let windowType;
-      if (navigator.userAgent.indexOf("Firefox") !== -1) {
+      if (isFirefox) {
         windowType = "detached_panel";
       } else {
         windowType = "panel";