fix

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

Author: RomanNikitenko

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

@@ -216,12 +216,20 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
   }
 
   private async resolveToken(sortedScopes: string[]): Promise<string> {
+    const token = await this.getTokenIfSufficient(sortedScopes);
+    if (!token) {
+      return await this.getDeviceAuthentication().runInteractiveFlow(sortedScopes);
+    }
+    return token;
+  }
+
+  private async getTokenIfSufficient(sortedScopes: string[]): Promise<string | undefined> {
     try {
       const token = await this.githubService.getToken();
       const existingScopes = await this.githubService.getTokenScopes(token);
       if (!hasAllScopes(existingScopes, sortedScopes)) {
         this.logger.info('GitHubAuthProvider: token lacks required scopes, starting device flow');
-        return await this.getDeviceAuthentication().runInteractiveFlow(sortedScopes);
+        return undefined;
       }
 
       const isDeviceAuth = await this.githubService.isDeviceAuthToken();
@@ -232,7 +240,7 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
         );
         if (hasExistingSession) {
           this.logger.info('GitHubAuthProvider: PAT session already exists for requested scopes, starting device auth flow');
-          return await this.getDeviceAuthentication().runInteractiveFlow(sortedScopes);
+          return undefined;
         }
       }
 
@@ -243,7 +251,7 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
       } else {
         this.logger.info('GitHubAuthProvider: no token available, starting device flow');
       }
-      return await this.getDeviceAuthentication().runInteractiveFlow(sortedScopes);
+      return undefined;
     }
   }