fix

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

code/extensions/che-github-authentication/src/github.ts

@@ -88,39 +88,51 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
       }
     }
 
-    try {
-      const token = await this.githubService.getToken();
-      const tokenScopes = await this.githubService.getTokenScopes(token);
-      if (tokenScopes.length === 0) {
-        this.logger.info('GitHubAuthProvider: hydrate skipped, token has no scopes');
-        return;
-      }
+    await this.tryHydrate(3, 500);
+  }
 
-      const githubUser = await this.githubService.getUser();
-      const matchingBundles = getMatchingHydrationScopeBundles(tokenScopes);
-      if (matchingBundles.length === 0) {
-        this.logger.info('GitHubAuthProvider: hydrate skipped, token scopes match no known bundle');
-        return;
-      }
+  private async tryHydrate(maxAttempts: number, delayMs: number): Promise<void> {
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        const token = await this.githubService.getToken();
+        const tokenScopes = await this.githubService.getTokenScopes(token);
+        if (tokenScopes.length === 0) {
+          this.logger.info('GitHubAuthProvider: hydrate skipped, token has no scopes');
+          return;
+        }
 
-      const isDeviceAuthToken = await this.githubService.isDeviceAuthToken();
-      const account = { label: githubUser.login, id: githubUser.id.toString() };
-      const hydratedSessions = matchingBundles.map(scopes => ({
-        id: v4(),
-        accessToken: token,
-        account,
-        scopes: isDeviceAuthToken ? scopes : [...scopes, WORKSPACE_PAT_SCOPE],
-      }));
-
-      await this.storeSessions(hydratedSessions);
-      this.sessionChangeEmitter.fire({ added: hydratedSessions, removed: [], changed: [] });
-      const tokenSource = isDeviceAuthToken ? 'device authentication' : 'workspace PAT';
-      this.logger.info(`GitHubAuthProvider: hydrated ${hydratedSessions.length} session(s) from K8s ${tokenSource}`);
-    } catch (error) {
-      if (isUnauthorizedError(error)) {
-        this.logger.warn('GitHubAuthProvider: hydrate failed, token is not valid');
-      } else {
-        this.logger.warn(`GitHubAuthProvider: hydrate failed: ${(error as Error).message}`);
+        const githubUser = await this.githubService.getUser();
+        const matchingBundles = getMatchingHydrationScopeBundles(tokenScopes);
+        if (matchingBundles.length === 0) {
+          this.logger.info('GitHubAuthProvider: hydrate skipped, token scopes match no known bundle');
+          return;
+        }
+
+        const isDeviceAuthToken = await this.githubService.isDeviceAuthToken();
+        const account = { label: githubUser.login, id: githubUser.id.toString() };
+        const hydratedSessions = matchingBundles.map(scopes => ({
+          id: v4(),
+          accessToken: token,
+          account,
+          scopes: isDeviceAuthToken ? scopes : [...scopes, WORKSPACE_PAT_SCOPE],
+        }));
+
+        await this.storeSessions(hydratedSessions);
+        this.sessionChangeEmitter.fire({ added: hydratedSessions, removed: [], changed: [] });
+        const tokenSource = isDeviceAuthToken ? 'device authentication' : 'workspace PAT';
+        this.logger.info(`GitHubAuthProvider: hydrated ${hydratedSessions.length} session(s) from K8s ${tokenSource}`);
+        return;
+      } catch (error) {
+        if (isUnauthorizedError(error)) {
+          this.logger.warn('GitHubAuthProvider: hydrate failed, token is not valid');
+          return;
+        }
+        if (attempt < maxAttempts) {
+          this.logger.info(`GitHubAuthProvider: hydrate attempt ${attempt}/${maxAttempts} failed: ${(error as Error).message}, retrying in ${delayMs}ms`);
+          await new Promise(resolve => setTimeout(resolve, delayMs));
+        } else {
+          this.logger.warn(`GitHubAuthProvider: hydrate failed after ${maxAttempts} attempts: ${(error as Error).message}`);
+        }
       }
     }
   }