Enhance GitHubClient authentication and improve PR input form cancel behavior

Author: zaknafeyn

src/common/api/ghClient.ts

@@ -21,17 +21,28 @@ export class GitHubClient {
     return this._repo;
   }
 
-  private async getAuthToken(): Promise<string | undefined> {
+  private async getAuthToken(reAuthenticate = false): Promise<string | undefined> {
     try {
-      const session = await authentication.getSession('github', ['repo'], { createIfNone: true });
+      const scope = ['repo'];
+      const session = reAuthenticate
+        ? await authentication.getSession('github', scope, {
+            forceNewSession: true,
+            clearSessionPreference: true,
+          })
+        : await authentication.getSession('github', scope, { createIfNone: true });
       return session.accessToken;
     } catch (error) {
       throw new Error(`GitHub authentication failed: ${error}`);
     }
   }
 
-  private async makeRequest<T>(endpoint: string, method: string = 'GET', body?: any): Promise<T> {
-    const token = await this.getAuthToken();
+  private async makeRequest<T>(
+    endpoint: string,
+    method: string = 'GET',
+    body?: any,
+    reAuthenticate = false
+  ): Promise<T> {
+    const token = await this.getAuthToken(reAuthenticate);
     const url = `${GitHubClient.BASE_URL}${endpoint}`;
 
     const headers: { [key: string]: string } = {
@@ -62,6 +73,10 @@ export class GitHubClient {
         });
 
         res.on('end', () => {
+          if (res.statusCode && res.statusCode === 403) {
+            // todo: add reauthenticate method and retry
+          }
+
           if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
             try {
               resolve(JSON.parse(data));

src/extension.ts

@@ -17,8 +17,6 @@ import { getGitExecutor } from './utils/getGitExecutor';
 import { GitHubClient } from './common/api/ghClient';
 
 export function activate(context: vscode.ExtensionContext) {
-  console.log(`Extension "${EXTENSION_NAME}" is now active!`);
-
   const commandManager = new CommandManager();
 
   const configManager = new ConfigurationManager();
@@ -37,7 +35,7 @@ export function activate(context: vscode.ExtensionContext) {
     prCloneService
   );
 
-  logService.info('Start...');
+  logService.info(`Extension "${EXTENSION_NAME}" is now active!`);
 
   // Set initial context to hide PR Clone view and commits view
   setContextShowPRClone(false);

src/webview/Apps/PR/pages/PrInputForm/index.tsx

@@ -35,14 +35,27 @@ export const PrInputForm: React.FC<PrInputFormProps> = ({
 
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === 'Escape' && !loadPullRequestData.isLoading) {
-        onCancel();
+      if (event.key === 'Escape') {
+        handleCancel();
       }
     };
 
     document.addEventListener('keydown', handleKeyDown);
     return () => document.removeEventListener('keydown', handleKeyDown);
-  }, [onCancel, loadPullRequestData.isLoading]);
+  }, [loadPullRequestData.isLoading]);
+
+  const handleCancel = () => {
+    if (loadPullRequestData.isLoading) {
+      // Cancel the fetch process but don't close panel
+      loadPullRequestData.finish();
+      logger.info('PR fetch cancelled by user');
+      // todo: remove onCancel and send message to provider to cancer running request
+      onCancel();
+    } else {
+      // Close the panel when not fetching
+      onCancel();
+    }
+  };
 
   const handleSubmit = (e: React.FormEvent) => {
     logger.info('Fetching PR data ...')
@@ -74,8 +87,7 @@ export const PrInputForm: React.FC<PrInputFormProps> = ({
           <Button
             type="button"
             variant="secondary"
-            onClick={onCancel}
-            disabled={loadPullRequestData.isLoading}
+            onClick={handleCancel}
           >
             Cancel
           </Button>