move refresh to cookieListener

src/background.js

@@ -11,12 +11,7 @@ class AccessToken {
     tokenPool.generateTokens();
   }
 
-  static async get() {
-    const token = AccessToken.TOKEN;
-    if (token) {
-      return token;
-    }
-    await AccessToken.refresh();
+  static get() {
     return AccessToken.TOKEN;
   }
 
@@ -55,6 +50,9 @@ const cookieListener = (changeInfo) => {
 
   if (removed) {
     AccessToken.destroy();
+    // try to refresh the token incase remove was caused by
+    // token expiring
+    AccessToken.refresh();
     return;
   }
 
@@ -69,6 +67,10 @@ const lookForAccessToken = async () => {
   });
   if (cookie) {
     AccessToken.set(cookie.value);
+  } else {
+    // if token is not found on startup try to refresh
+    // as it can just be expired
+    AccessToken.refresh();
   };
 }
 

src/token-pool.js

@@ -39,7 +39,7 @@ class TokenPool {
   }
 
   async generateTokens() {
-    const accessToken = await AccessToken.get();
+    const accessToken = AccessToken.get();
     if (!accessToken) {
       return;
     }
@@ -53,17 +53,17 @@ class TokenPool {
       pretokens.push({ token, blindFactor });
     }
 
-    let response = await this._fetchNewTokens(accessToken, blindTokens);
-    if (response.status === 401) {
-      // try to refresh token and try again if authorization failed
-      // as the token technically could have expired by the time the request
-      // arives
-      const accessToken = await AccessToken.get();
-      if (!accessToken) {
-        return;
-      }
-      response = await this._fetchNewTokens(accessToken, blindTokens);
-    }
+    const response = await fetch(`${API_BASE_URL}/tokens/new`, {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${accessToken}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        blindTokens,
+      }),
+    });
+
     if (response.ok) {
       const { tokens } = await response.json();
       const res = [];
@@ -86,17 +86,4 @@ class TokenPool {
       this.tokens.push(...res);
     }
   }
-
-  async _fetchNewTokens(accessToken, blindTokens) {
-    return fetch(`${API_BASE_URL}/tokens/new`, {
-      method: 'POST',
-      headers: {
-        'Authorization': `Bearer ${accessToken}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        blindTokens,
-      }),
-    });
-  }
 }