Change GK account authentication to no longer use the VS Code authent…

…ication system (#3524) * Stop registering the authentication provider in VS Code authentication. (#3524) * Getting/creating a session honors `createIfNeeded` flag (#3524)
gitkraken · Sep 11, 2024 · cf6766d · cf6766d
1 parent 77462fc
commit cf6766d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/src/plus/gk/account/authenticationProvider.ts b/src/plus/gk/account/authenticationProvider.ts
@@ -3,7 +3,7 @@ import type {
 	AuthenticationProviderAuthenticationSessionsChangeEvent,
 	AuthenticationSession,
 } from 'vscode';
-import { authentication, Disposable, EventEmitter, window } from 'vscode';
+import { Disposable, EventEmitter, window } from 'vscode';
 import { uuid } from '@env/crypto';
 import type { Container, Environment } from '../../../container';
 import { CancellationError } from '../../../errors';
@@ -27,7 +27,6 @@ interface StoredSession {
 
 export const authenticationProviderId = 'gitlens+';
 export const authenticationProviderScopes = ['gitlens'];
-const authenticationLabel = 'GitKraken: GitLens';
 
 export interface AuthenticationProviderOptions {
 	signUp?: boolean;
@@ -57,9 +56,6 @@ export class AccountAuthenticationProvider implements AuthenticationProvider, Di
 
 		this._disposable = Disposable.from(
 			this._authConnection,
-			authentication.registerAuthenticationProvider(authenticationProviderId, authenticationLabel, this, {
-				supportsMultipleAccounts: false,
-			}),
 			this.container.storage.onDidChangeSecrets(() => this.checkForUpdates()),
 		);
 	}
@@ -234,6 +230,20 @@ export class AccountAuthenticationProvider implements AuthenticationProvider, Di
 		}
 	}
 
+	public async getOrCreateSession(
+		scopes: string[],
+		createIfNeeded: boolean,
+	): Promise<AuthenticationSession | undefined> {
+		const session = (await this.getSessions(scopes))[0];
+		if (session != null) {
+			return session;
+		}
+		if (!createIfNeeded) {
+			return undefined;
+		}
+		return this.createSession(scopes);
+	}
+
 	private async createSessionForToken(token: string, scopes: string[]): Promise<AuthenticationSession> {
 		const userInfo = await this._authConnection.getAccountInfo(token);
 		return {

diff --git a/src/plus/gk/account/subscriptionService.ts b/src/plus/gk/account/subscriptionService.ts
@@ -7,7 +7,6 @@ import type {
 	StatusBarItem,
 } from 'vscode';
 import {
-	authentication,
 	CancellationTokenSource,
 	version as codeVersion,
 	Disposable,
@@ -50,7 +49,7 @@ import { getSubscriptionFromCheckIn } from '../checkin';
 import type { ServerConnection } from '../serverConnection';
 import { ensurePlusFeaturesEnabled } from '../utils';
 import { AuthenticationContext } from './authenticationConnection';
-import { authenticationProviderId, authenticationProviderScopes } from './authenticationProvider';
+import { authenticationProviderScopes } from './authenticationProvider';
 import type { Organization } from './organization';
 import { getApplicablePromo } from './promos';
 import type { Subscription } from './subscription';
@@ -1053,10 +1052,10 @@ export class SubscriptionService implements Disposable {
 			if (options != null && createIfNeeded) {
 				this.container.accountAuthentication.setOptionsForScopes(authenticationProviderScopes, options);
 			}
-			session = await authentication.getSession(authenticationProviderId, authenticationProviderScopes, {
-				createIfNone: createIfNeeded,
-				silent: !createIfNeeded,
-			});
+			session = await this.container.accountAuthentication.getOrCreateSession(
+				authenticationProviderScopes,
+				createIfNeeded,
+			);
 		} catch (ex) {
 			session = null;
 			if (options != null && createIfNeeded) {