Fix: only auth user on 401 error, don't display login window without user interaction

background/sync.js

@@ -48,8 +48,10 @@ const sync = (() => {
     }
   });
 
-  prefs.subscribe(['sync.enabled'], onPrefChange);
-  onPrefChange(null, prefs.get('sync.enabled'));
+  const initializing = prefs.initializing.then(() => {
+    prefs.subscribe(['sync.enabled'], onPrefChange);
+    onPrefChange(null, prefs.get('sync.enabled'));
+  });
 
   chrome.alarms.onAlarm.addListener(info => {
     if (info.name === 'syncNow') {
@@ -57,7 +59,7 @@ const sync = (() => {
     }
   });
 
-  return {
+  return ensurePrepared({
     start,
     stop,
     put: (...args) => {
@@ -72,7 +74,15 @@ const sync = (() => {
     },
     syncNow,
     getStatus: () => status
-  };
+  });
+
+  function ensurePrepared(obj) {
+    return Object.entries(obj).reduce((o, [key, fn]) => {
+      o[key] = (...args) =>
+        initializing.then(() => fn(...args));
+      return o;
+    }, {});
+  }
 
   function onProgress(e) {
     if (e.phase === 'start') {
@@ -152,7 +162,7 @@ const sync = (() => {
     status.currentDriveName = currentDrive.name;
     emitStatusChange();
     return withFinally(
-      tokenManager.getToken(name)
+      tokenManager.getToken(name, !fromPref)
         .catch(err => {
           if (/Authorization page could not be loaded/i.test(err.message)) {
             // FIXME: Chrome always fails at the first login so we try again

background/token-manager.js

@@ -65,15 +65,26 @@ const tokenManager = (() => {
     return k;
   }
 
-  function getToken(name) {
+  function getToken(name, interactive) {
     const k = buildKeys(name);
     return chromeLocal.get(k.LIST)
       .then(obj => {
-        if (!obj[k.TOKEN] || Date.now() > obj[k.EXPIRE]) {
-          return refreshToken(name, k, obj)
-            .catch(() => authUser(name, k));
+        if (!obj[k.TOKEN]) {
+          return authUser(name, k, interactive);
         }
-        return obj[k.TOKEN];
+        if (Date.now() < obj[k.EXPIRE]) {
+          return obj[k.TOKEN];
+        }
+        if (obj[k.EXPIRE]) {
+          return refreshToken(name, k, obj)
+            .catch(err => {
+              if (err.code === 401) {
+                return authUser(name, k, interactive);
+              }
+              throw err;
+            });
+        }
+        return authUser(name, k, interactive);
       });
   }
 
@@ -124,7 +135,7 @@ const tokenManager = (() => {
     return search.toString();
   }
 
-  function authUser(name, k) {
+  function authUser(name, k, interactive = false) {
     const provider = AUTH[name];
     const state = Math.random().toFixed(8).slice(2);
     const query = {
@@ -142,7 +153,7 @@ const tokenManager = (() => {
     const url = `${provider.authURL}?${stringifyQuery(query)}`;
     return launchWebAuthFlow({
       url,
-      interactive: true
+      interactive
     })
       .then(url => {
         const params = new URLSearchParams(
@@ -201,7 +212,9 @@ const tokenManager = (() => {
         }
         return r.text()
           .then(body => {
-            throw new Error(`failed to fetch (${r.status}): ${body}`);
+            const err = new Error(`failed to fetch (${r.status}): ${body}`);
+            err.code = r.status;
+            throw err;
           });
       });
   }