Stores and uses stored values for configured integration descriptors

Author: axosoft-ramint

src/constants.storage.ts

@@ -78,6 +78,7 @@ export type GlobalStorage = {
 	'launchpadView:groups:expanded': StoredLaunchpadGroup[];
 	'graph:searchMode': StoredGraphSearchMode;
 	'views:scm:grouped:welcome:dismissed': boolean;
+	'integrations:configured': StoredIntegrationConfigurations;
 } & { [key in `plus:preview:${FeaturePreviews}:usages`]: StoredFeaturePreviewUsagePeriod[] } & {
 	[key in `confirm:ai:tos:${AIProviders}`]: boolean;
 } & {
@@ -88,6 +89,19 @@ export type GlobalStorage = {
 	[key in `jira:${string}:projects`]: Stored<StoredJiraProject[] | undefined>;
 };
 
+export type StoredIntegrationConfigurations = Record<
+	string,
+	StoredConfiguredProviderAuthenticationDescriptor[] | undefined
+>;
+
+export interface StoredConfiguredProviderAuthenticationDescriptor {
+	cloud: boolean;
+	integrationId: IntegrationId;
+	domain?: string;
+	expiresAt?: string;
+	scopes: string;
+}
+
 export type DeprecatedWorkspaceStorage = {
 	/** @deprecated use `confirm:ai:tos:${AIProviders}` */
 	'confirm:sendToOpenAI': boolean;

src/env/node/git/sub-providers/remotes.ts

@@ -38,11 +38,9 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase implements Git
 		let remotesPromise = this.cache.remotes?.get(repoPath);
 		if (remotesPromise == null) {
 			async function load(this: RemotesGitSubProvider): Promise<GitRemote[]> {
-				const ci = await this.container.cloudIntegrations;
-				const connections = await ci?.getConnections();
 				const providers = loadRemoteProviders(
 					configuration.get('remotes', this.container.git.getRepository(repoPath!)?.folder?.uri ?? null),
-					connections,
+					this.container.integrations.getConfiguredIntegrationDescriptors(),
 				);
 
 				try {
@@ -51,7 +49,7 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase implements Git
 						this.container,
 						data,
 						repoPath!,
-						await getRemoteProviderMatcher(this.container, providers),
+						getRemoteProviderMatcher(this.container, providers),
 					);
 					return remotes;
 				} catch (ex) {

src/git/parsers/remoteParser.ts

@@ -10,7 +10,7 @@ export function parseGitRemotes(
 	container: Container,
 	data: string,
 	repoPath: string,
-	remoteProviderMatcher: Awaited<ReturnType<typeof getRemoteProviderMatcher>>,
+	remoteProviderMatcher: ReturnType<typeof getRemoteProviderMatcher>,
 ): GitRemote[] {
 	using sw = maybeStopWatch(`Git.parseRemotes(${repoPath})`, { log: false, logLevel: 'debug' });
 	if (!data) return [];

src/git/remotes/remoteProviders.ts

@@ -1,8 +1,7 @@
 import type { RemotesConfig } from '../../config';
 import { SelfHostedIntegrationId } from '../../constants.integrations';
 import type { Container } from '../../container';
-import type { CloudIntegrationConnection } from '../../plus/integrations/authentication/models';
-import { toIntegrationId } from '../../plus/integrations/authentication/models';
+import type { ConfiguredProviderAuthenticationDescriptor } from '../../plus/integrations/authentication/models';
 import { Logger } from '../../system/logger';
 import { configuration } from '../../system/vscode/configuration';
 import { AzureDevOpsRemote } from './azure-devops';
@@ -78,7 +77,7 @@ const builtInProviders: RemoteProviders = [
 
 export function loadRemoteProviders(
 	cfg: RemotesConfig[] | null | undefined,
-	connectedIntegrations: CloudIntegrationConnection[] | undefined,
+	configuredIntegrations?: ConfiguredProviderAuthenticationDescriptor[],
 ): RemoteProviders {
 	const providers: RemoteProviders = [];
 
@@ -103,10 +102,10 @@ export function loadRemoteProviders(
 		}
 	}
 
-	if (connectedIntegrations?.length) {
-		for (const ci of connectedIntegrations) {
-			if (toIntegrationId[ci.provider] === SelfHostedIntegrationId.CloudGitHubEnterprise) {
-				const matcher = new URL(ci.domain).host.toLocaleLowerCase();
+	if (configuredIntegrations?.length) {
+		for (const ci of configuredIntegrations) {
+			if (ci.integrationId === SelfHostedIntegrationId.CloudGitHubEnterprise && ci.domain) {
+				const matcher = ci.domain.toLocaleLowerCase();
 				const providerCreator = (_container: Container, domain: string, path: string) =>
 					new GitHubRemote(domain, path);
 				const provider = {
@@ -165,14 +164,15 @@ function getCustomProviderCreator(cfg: RemotesConfig) {
 	}
 }
 
-export async function getRemoteProviderMatcher(
+export function getRemoteProviderMatcher(
 	container: Container,
 	providers?: RemoteProviders,
-): Promise<(url: string, domain: string, path: string) => RemoteProvider | undefined> {
+): (url: string, domain: string, path: string) => RemoteProvider | undefined {
 	if (providers == null) {
-		const ci = await container.cloudIntegrations;
-		const c = await ci?.getConnections();
-		providers = loadRemoteProviders(configuration.get('remotes', null), c);
+		providers = loadRemoteProviders(
+			configuration.get('remotes', null),
+			container.integrations.getConfiguredIntegrationDescriptors(),
+		);
 	}
 
 	return (url: string, domain: string, path: string) =>

src/plus/drafts/draftsService.ts

@@ -729,7 +729,7 @@ export class DraftService implements Disposable {
 		} else if (data.provider?.repoName != null) {
 			name = data.provider.repoName;
 		} else if (data.remote?.url != null && data.remote?.domain != null && data.remote?.path != null) {
-			const matcher = await getRemoteProviderMatcher(this.container);
+			const matcher = getRemoteProviderMatcher(this.container);
 			const provider = matcher(data.remote.url, data.remote.domain, data.remote.path);
 			name = provider?.repoName ?? data.remote.path;
 		} else {

src/plus/integrations/authentication/github.ts

@@ -4,16 +4,19 @@ import { wrapForForcedInsecureSSL } from '@env/fetch';
 import { HostingIntegrationId, SelfHostedIntegrationId } from '../../../constants.integrations';
 import type { Sources } from '../../../constants.telemetry';
 import type { Container } from '../../../container';
-import type { IntegrationAuthenticationSessionDescriptor } from './integrationAuthentication';
+import type {
+	IntegrationAuthenticationService,
+	IntegrationAuthenticationSessionDescriptor,
+} from './integrationAuthentication';
 import {
 	CloudIntegrationAuthenticationProvider,
 	LocalIntegrationAuthenticationProvider,
 } from './integrationAuthentication';
 import type { ProviderAuthenticationSession } from './models';
 
 export class GitHubAuthenticationProvider extends CloudIntegrationAuthenticationProvider<HostingIntegrationId.GitHub> {
-	constructor(container: Container) {
-		super(container);
+	constructor(container: Container, authenticationService: IntegrationAuthenticationService) {
+		super(container, authenticationService);
 		this.disposables.push(
 			authentication.onDidChangeSessions(e => {
 				if (e.provider.id === this.authProviderId) {

src/plus/integrations/authentication/gitlab.ts

@@ -3,7 +3,10 @@ import { env, ThemeIcon, Uri, window } from 'vscode';
 import type { SelfHostedIntegrationId } from '../../../constants.integrations';
 import { HostingIntegrationId } from '../../../constants.integrations';
 import type { Container } from '../../../container';
-import type { IntegrationAuthenticationSessionDescriptor } from './integrationAuthentication';
+import type {
+	IntegrationAuthenticationService,
+	IntegrationAuthenticationSessionDescriptor,
+} from './integrationAuthentication';
 import {
 	CloudIntegrationAuthenticationProvider,
 	LocalIntegrationAuthenticationProvider,
@@ -15,9 +18,10 @@ type GitLabId = HostingIntegrationId.GitLab | SelfHostedIntegrationId.GitLabSelf
 export class GitLabLocalAuthenticationProvider extends LocalIntegrationAuthenticationProvider<GitLabId> {
 	constructor(
 		container: Container,
+		authenticationService: IntegrationAuthenticationService,
 		protected readonly authProviderId: GitLabId,
 	) {
-		super(container);
+		super(container, authenticationService);
 	}
 
 	override async createSession(