Browser componnet

Author: rebornix

src/background.ts

@@ -12,6 +12,7 @@ import { getSiteName, getMatchedEntries } from "./utils";
 import { CodeState } from "./models/otp";
 
 import { getOTPAuthPerLineFromOPTAuthMigration } from "./models/migration";
+import { isChrome } from "./browser";
 
 let cachedPassphrase = "";
 let autolockTimeout: number;
@@ -289,9 +290,7 @@ async function getTotp(text: string, silent = false) {
 
 function getBackupToken(service: string) {
   if (
-    navigator.userAgent.indexOf("Chrome") !== -1 &&
-    navigator.userAgent.indexOf("Edg") === -1 &&
-    service === "drive"
+    isChrome && service === "drive"
   ) {
     chrome.identity.getAuthToken(
       {
@@ -517,10 +516,7 @@ chrome.runtime.onInstalled.addListener(async (details) => {
 
   let url: string | null = null;
 
-  if (
-    navigator.userAgent.indexOf("Chrome") !== -1 &&
-    navigator.userAgent.indexOf("Edg") === -1
-  ) {
+  if (isChrome) {
     url = "https://otp.ee/chromeissues";
   }
 

src/browser.ts

@@ -0,0 +1,7 @@
+const userAgent = navigator.userAgent;
+
+export const isFirefox = (userAgent.indexOf('Firefox') >= 0);
+export const isWebKit = (userAgent.indexOf('AppleWebKit') >= 0);
+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/DrivePage.vue

@@ -34,6 +34,7 @@
 </template>
 <script lang="ts">
 import Vue from "vue";
+import { isChrome } from "../../browser";
 import { Drive } from "../../models/backup";
 
 const service = "drive";
@@ -80,10 +81,7 @@ export default Vue.extend({
         );
         xhr.onreadystatechange = () => {
           if (xhr.readyState === 4) {
-            if (
-              navigator.userAgent.indexOf("Chrome") !== -1 &&
-              navigator.userAgent.indexOf("Edg") === -1
-            ) {
+            if (isChrome) {
               chrome.identity.removeCachedAuthToken(
                 { token: localStorage.driveToken },
                 () => {

src/store/Accounts.ts

@@ -4,7 +4,7 @@ import * as CryptoJS from "crypto-js";
 import { OTPType, OTPAlgorithm } from "../models/otp";
 import { ActionContext } from "vuex";
 import { getSiteName, getMatchedEntriesHash } from "../utils";
-
+import { isChromium } from "../browser";
 export class Accounts implements Module {
   async getModule() {
     const cachedPassphrase = await this.getCachedPassphrase();
@@ -392,7 +392,7 @@ export class Accounts implements Module {
             await state.dispatch("updateEntries");
 
             // https://github.com/Authenticator-Extension/Authenticator/issues/412
-            if (navigator.userAgent.indexOf("Chrome") !== -1) {
+            if (isChromium) {
               await BrowserStorage.clearLogs();
             }