Merge pull request #432 from Authenticator-Extension/new-edge-fixes

New edge fixes

Author: mymindstorm

src/background.ts

@@ -219,7 +219,11 @@ async function getTotp(text: string) {
 }
 
 function getBackupToken(service: string) {
-  if (navigator.userAgent.indexOf("Chrome") !== -1 && service === "drive") {
+  if (
+    navigator.userAgent.indexOf("Chrome") !== -1 &&
+    navigator.userAgent.indexOf("Edg") === -1 &&
+    service === "drive"
+  ) {
     chrome.identity.getAuthToken(
       {
         interactive: true,
@@ -233,18 +237,26 @@ function getBackupToken(service: string) {
     );
   } else {
     let authUrl = "";
+    let redirUrl = "";
     if (service === "dropbox") {
+      redirUrl = encodeURIComponent(chrome.identity.getRedirectURL());
       authUrl =
         "https://www.dropbox.com/oauth2/authorize?response_type=token&client_id=" +
         getCredentials().dropbox.client_id +
         "&redirect_uri=" +
-        encodeURIComponent(chrome.identity.getRedirectURL());
+        redirUrl;
     } else if (service === "drive") {
+      if (navigator.userAgent.indexOf("Edg") !== -1) {
+        redirUrl = encodeURIComponent("https://authenticator.cc/oauth-edge");
+      } else {
+        redirUrl = encodeURIComponent("https://authenticator.cc/oauth");
+      }
+
       authUrl =
         "https://accounts.google.com/o/oauth2/v2/auth?response_type=code&access_type=offline&client_id=" +
         getCredentials().drive.client_id +
         "&scope=https%3A//www.googleapis.com/auth/drive.file&prompt=consent&redirect_uri=" +
-        encodeURIComponent("https://authenticator.cc/oauth");
+        redirUrl;
     }
     chrome.identity.launchWebAuthFlow(
       { url: authUrl, interactive: true },
@@ -296,7 +308,9 @@ function getBackupToken(service: string) {
                         getCredentials().drive.client_secret +
                         "&code=" +
                         value +
-                        "&redirect_uri=https://authenticator.cc/oauth&grant_type=authorization_code"
+                        "&redirect_uri=" +
+                        redirUrl +
+                        "&grant_type=authorization_code"
                     );
                     xhr.setRequestHeader("Accept", "application/json");
                     xhr.setRequestHeader(
@@ -365,7 +379,10 @@ chrome.runtime.onInstalled.addListener(async details => {
 
   let url: string | null = null;
 
-  if (navigator.userAgent.indexOf("Chrome") !== -1) {
+  if (
+    navigator.userAgent.indexOf("Chrome") !== -1 &&
+    navigator.userAgent.indexOf("Edg") === -1
+  ) {
     url = "https://authenticator.cc/docs/en/chrome-issues";
   }
 

src/components/Popup/DrivePage.vue

@@ -79,7 +79,10 @@ export default Vue.extend({
         );
         xhr.onreadystatechange = () => {
           if (xhr.readyState === 4) {
-            if (navigator.userAgent.indexOf("Chrome") !== -1) {
+            if (
+              navigator.userAgent.indexOf("Chrome") !== -1 &&
+              navigator.userAgent.indexOf("Edg") === -1
+            ) {
               chrome.identity.removeCachedAuthToken(
                 { token: localStorage.driveToken },
                 () => {

src/components/Popup/MenuPage.vue

@@ -106,6 +106,8 @@ export default Vue.extend({
 
       if (navigator.userAgent.indexOf("Firefox") !== -1) {
         url = "https://authenticator.cc/docs/en/firefox-issues";
+      } else if (navigator.userAgent.indexOf("Edg") !== -1) {
+        url = "https://authenticator.cc/docs/en/edge-issues";
       }
 
       const feedbackURL = this.$store.state.menu.feedbackURL;

src/models/backup.ts

@@ -129,7 +129,8 @@ export class Drive implements BackupProvider {
                   if (res.error.code === 401) {
                     if (
                       navigator.userAgent.indexOf("Chrome") !== -1 &&
-                      navigator.userAgent.indexOf("OPR") === -1
+                      navigator.userAgent.indexOf("OPR") === -1 &&
+                      navigator.userAgent.indexOf("Edg") === -1
                     ) {
                       // Clear invalid token from
                       // chrome://identity-internals/
@@ -162,7 +163,8 @@ export class Drive implements BackupProvider {
   private async refreshToken() {
     if (
       navigator.userAgent.indexOf("Chrome") !== -1 &&
-      navigator.userAgent.indexOf("OPR") === -1
+      navigator.userAgent.indexOf("OPR") === -1 &&
+      navigator.userAgent.indexOf("Edg") === -1
     ) {
       return new Promise((resolve: (value: boolean) => void) => {
         return chrome.identity.getAuthToken(