Fixes #4065 handles auth timeout

Handles auth timeout errors for when user disables auth extensions
Special-cases GitHub auth check to avoid timeout delay

Author: eamodio

CHANGELOG.md

@@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Fixes incorrect PR Link Across Azure DevOps Projects ([#4207](https://github.com/gitkraken/vscode-gitlens/issues/4207))
 - Fixes detail view incorrectly parses GitHub account in commit message ([#3246](https://github.com/gitkraken/vscode-gitlens/issues/3246))
 - Fixes custom instructions are sometimes ignored ([#4267](https://github.com/gitkraken/vscode-gitlens/issues/4267))
+- Fixes timed out waiting for authentication provider to register in GitLens after update to version 16.3 ([#4065](https://github.com/gitkraken/vscode-gitlens/issues/4065))
 
 ## [17.0.3] - 2025-04-17
 

src/plus/gk/utils/-webview/integrationAuthentication.utils.ts

@@ -1,11 +1,15 @@
-import { authentication } from 'vscode';
+import { authentication, extensions } from 'vscode';
 import { wrapForForcedInsecureSSL } from '@env/fetch';
 import type { IntegrationId } from '../../../../constants.integrations';
 import type { Container } from '../../../../container';
 import { sequentialize } from '../../../../system/function';
+import { Logger } from '../../../../system/logger';
+import { getLogScope } from '../../../../system/logger.scope';
 import type { IntegrationAuthenticationSessionDescriptor } from '../../../integrations/authentication/integrationAuthenticationProvider';
 import type { ProviderAuthenticationSession } from '../../../integrations/authentication/models';
 
+const failedAuthProviderIds = new Set<string>();
+
 export const getBuiltInIntegrationSession = sequentialize(
 	(
 		container: Container,
@@ -19,18 +23,45 @@ export const getBuiltInIntegrationSession = sequentialize(
 		wrapForForcedInsecureSSL(
 			container.integrations.ignoreSSLErrors({ id: id, domain: descriptor.domain }),
 			async () => {
-				const session = await authentication.getSession(id, descriptor.scopes, {
-					createIfNone: options?.createIfNeeded,
-					silent: options?.silent,
-					forceNewSession: options?.forceNewSession,
-				});
-				if (session == null) return undefined;
+				if (failedAuthProviderIds.has(id)) return undefined;
+
+				const scope = getLogScope();
+
+				if (id === 'github') {
+					const extension = extensions.getExtension('vscode.github-authentication');
+					if (extension == null) {
+						failedAuthProviderIds.add(id);
+						Logger.warn(scope, `Authentication provider '${id}' is not registered; User has disabled it`);
+						return undefined;
+					}
+				}
+
+				try {
+					const session = await authentication.getSession(id, descriptor.scopes, {
+						createIfNone: options?.createIfNeeded,
+						silent: options?.silent,
+						forceNewSession: options?.forceNewSession,
+					});
+					if (session == null) return undefined;
+
+					return {
+						...session,
+						cloud: false,
+						domain: descriptor.domain,
+					};
+				} catch (ex) {
+					if (typeof ex === 'string' && ex === 'Timed out waiting for authentication provider to register') {
+						failedAuthProviderIds.add(id);
+						Logger.warn(
+							scope,
+							`Authentication provider '${id}' is not registered; User likely has disabled it`,
+						);
+						return undefined;
+					}
 
-				return {
-					...session,
-					cloud: false,
-					domain: descriptor.domain,
-				};
+					Logger.error(ex, scope, 'getBuiltInIntegrationSession');
+					throw ex;
+				}
 			},
 		),
 );

src/plus/integrations/authentication/github.ts

@@ -1,9 +1,9 @@
 import type { Disposable, QuickInputButton } from 'vscode';
 import { authentication, env, ThemeIcon, Uri, window } from 'vscode';
-import { wrapForForcedInsecureSSL } from '@env/fetch';
 import { HostingIntegrationId, SelfHostedIntegrationId } from '../../../constants.integrations';
 import type { Sources } from '../../../constants.telemetry';
 import type { Container } from '../../../container';
+import { getBuiltInIntegrationSession } from '../../gk/utils/-webview/integrationAuthentication.utils';
 import type { ConfiguredIntegrationService } from './configuredIntegrationService';
 import type { IntegrationAuthenticationSessionDescriptor } from './integrationAuthenticationProvider';
 import {
@@ -33,38 +33,20 @@ export class GitHubAuthenticationProvider extends CloudIntegrationAuthentication
 		return HostingIntegrationId.GitHub;
 	}
 
-	private async getBuiltInExistingSession(
-		descriptor: IntegrationAuthenticationSessionDescriptor,
-		forceNewSession?: boolean,
-	): Promise<ProviderAuthenticationSession | undefined> {
-		return wrapForForcedInsecureSSL(
-			this.container.integrations.ignoreSSLErrors({ id: this.authProviderId, domain: descriptor?.domain }),
-			async () => {
-				const session = await authentication.getSession(this.authProviderId, descriptor.scopes, {
-					forceNewSession: forceNewSession ? true : undefined,
-					silent: forceNewSession ? undefined : true,
-				});
-				if (session == null) return undefined;
-				return {
-					...session,
-					cloud: false,
-					domain: descriptor.domain,
-				};
-			},
-		);
-	}
-
 	public override async getSession(
 		descriptor: IntegrationAuthenticationSessionDescriptor,
 		options?: { createIfNeeded?: boolean; forceNewSession?: boolean; source?: Sources },
 	): Promise<ProviderAuthenticationSession | undefined> {
-		let vscodeSession = await this.getBuiltInExistingSession(descriptor);
-
-		if (vscodeSession != null && options?.forceNewSession) {
-			vscodeSession = await this.getBuiltInExistingSession(descriptor, true);
+		let session = await getBuiltInIntegrationSession(this.container, this.authProviderId, descriptor, {
+			silent: true,
+		});
+		if (session != null && options?.forceNewSession) {
+			session = await getBuiltInIntegrationSession(this.container, this.authProviderId, descriptor, {
+				forceNewSession: true,
+			});
 		}
 
-		if (vscodeSession != null) return vscodeSession;
+		if (session != null) return session;
 
 		return super.getSession(descriptor, options);
 	}