WIP: always try to async renew token also when refresh token expires

src/utils/auth.ts

@@ -20,12 +20,7 @@ import {
   storeInstance,
   storeLoginState,
 } from "./storage";
-import {
-  getTokenPayload,
-  isTokenAlmostExpired,
-  isTokenExpired,
-  isValidToken,
-} from "./token";
+import { isTokenAlmostExpired, isValidToken } from "./token";
 import {
   clearTokenRenewalTimers,
   initializeTokenRenewal,
@@ -72,10 +67,8 @@ export async function initAuthentication(
   locale: string,
 ): Promise<void> {
   initializeTokenRenewal({
-    renewRefreshToken: (scope, locale) =>
-      renewRefreshToken(client, scope, locale),
-    renewAccessToken: (scope, locale) =>
-      renewAccessToken(client, scope, locale),
+    renewRefreshToken: (scope, locale) => renewToken(client, scope, locale),
+    renewAccessToken: (scope, locale) => renewToken(client, scope, locale),
   });
 
   const loginState = consumeLoginState();
@@ -315,32 +308,6 @@ function handleSubstitutionResult(token: OAuth2Token): void {
   }
 }
 
-/**
- * Redirect to login when refresh token expired.
- */
-function renewRefreshToken(
-  client: OAuth2Client,
-  scope: string,
-  locale: string,
-): Promise<void> {
-  log(
-    `Renewing refresh token for scope "${scope}" and locale "${locale}" by redirecting to login`,
-  );
-  return login(client, scope, locale);
-}
-
-/**
- * Renew access token when it expired.
- */
-function renewAccessToken(
-  client: OAuth2Client,
-  scope: string,
-  locale: string,
-): Promise<void> {
-  log(`Renewing access token for scope "${scope}" and locale "${locale}"`);
-  return renewToken(client, scope, locale);
-}
-
 /**
  * Asynchronously renew an access/refresh token pair (the old
  * access/refresh token will be revoked due to token rotation, tokens
@@ -353,17 +320,16 @@ export async function renewToken(
 ): Promise<void> {
   const instance = getInstance();
   const refreshToken = getRefreshToken(scope);
-  if (
-    !instance ||
-    !refreshToken ||
-    isTokenExpired(getTokenPayload(refreshToken))
-  ) {
+  if (!instance || !refreshToken) {
     log(
       `Refresh token for scope "${scope}" not present or expired, redirect to login`,
     );
     return login(client, scope, locale);
   }
 
+  log(
+    `Renewing refresh & access token for scope "${scope}" and locale "${locale}"`,
+  );
   try {
     const { refreshToken: newRefreshToken, accessToken: newAccessToken } =
       await postTokenRefresh(client, instance, scope, locale, refreshToken);