ZETA-9273: fix the access token logic for the app

razroo · Nov 9, 2024 · 2b509f8 · 2b509f8
1 parent 4b43305
commit 2b509f8
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/auth/auth.ts b/src/auth/auth.ts
@@ -55,16 +55,20 @@ export async function getAccessToken(context: vscode.ExtensionContext, isProduct
   let refreshTokenExpiry: number | undefined = 0;
 
   if (accessToken) {
-    const decodedAccessToken: any = jwtDecode(accessToken);
-    accessTokenExpiry = decodedAccessToken.exp * 1000; // Convert to milliseconds
-  }
+    try {
+      const decodedAccessToken: any = jwtDecode(accessToken);
+      accessTokenExpiry = decodedAccessToken.exp * 1000; // Convert to milliseconds
 
-  const now = Date.now();
+      const now = Date.now();
+      const fiveMinutesInMs = (5 * 60) * 1000;
 
-  if (now >= accessTokenExpiry - 5 * 60 * 1000) { // 5 minutes before expiry
-    try {
-      const newTokens = await refreshAccessToken(context, isProduction);
-      return newTokens.access_token;
+      // Check if token is expired or will expire in next 5 minutes
+      if (now >= accessTokenExpiry - fiveMinutesInMs) {
+        const newToken = await refreshAccessToken(context, isProduction);
+        return newToken;
+      }
+
+      return accessToken;
     } catch (error) {
       console.error('Failed to refresh token:', error);
       await vscode.commands.executeCommand(COMMAND_AUTH0_AUTH);