Use ExtensionIdentitfier class to squash some "toLower" bugs (microsoft#232179)

Fixes microsoft#231964

Author: TylerLeonhardt

src/vs/workbench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.ts

@@ -8,11 +8,12 @@ import { DisposableStore, IDisposable } from '../../../../../base/common/lifecyc
 import { localize, localize2 } from '../../../../../nls.js';
 import { Action2 } from '../../../../../platform/actions/common/actions.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { IQuickInputService, IQuickPick, IQuickPickItem, QuickPickInput } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IAccountUsage, IAuthenticationUsageService } from '../../../../services/authentication/browser/authenticationUsageService.js';
-import { AuthenticationSessionAccount, IAuthenticationExtensionsService, IAuthenticationService } from '../../../../services/authentication/common/authentication.js';
+import { AuthenticationSessionAccount, IAuthenticationExtensionsService, IAuthenticationService, INTERNAL_AUTH_PROVIDER_PREFIX } from '../../../../services/authentication/common/authentication.js';
 import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 
 export class ManageAccountPreferencesForExtensionAction extends Action2 {
@@ -71,9 +72,13 @@ class ManageAccountPreferenceForExtensionActionImpl {
 			providerIdToAccounts.set(providerId, await this._authenticationService.getAccounts(providerId));
 		} else {
 			for (const providerId of this._authenticationService.getProviderIds()) {
+				if (providerId.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
+					// Don't show internal providers
+					continue;
+				}
 				const accounts = await this._authenticationService.getAccounts(providerId);
 				for (const account of accounts) {
-					const usage = this._authenticationUsageService.readAccountUsages(providerId, account.label).find(u => u.extensionId === extensionId.toLowerCase());
+					const usage = this._authenticationUsageService.readAccountUsages(providerId, account.label).find(u => ExtensionIdentifier.equals(u.extensionId, extensionId));
 					if (usage) {
 						providerIds.push(providerId);
 						providerIdToAccounts.set(providerId, accounts);
@@ -113,7 +118,7 @@ class ManageAccountPreferenceForExtensionActionImpl {
 			// Get the last used scopes for the last used account. This will be used to pre-fill the scopes when adding a new account.
 			// If there's no scopes, then don't add this option.
 			const lastUsedScopes = accounts
-				.flatMap(account => this._authenticationUsageService.readAccountUsages(chosenProviderId!, account.label).find(u => u.extensionId === extensionId.toLowerCase()))
+				.flatMap(account => this._authenticationUsageService.readAccountUsages(chosenProviderId!, account.label).find(u => ExtensionIdentifier.equals(u.extensionId, extensionId)))
 				.filter((usage): usage is IAccountUsage => !!usage)
 				.sort((a, b) => b.lastUsed - a.lastUsed)?.[0]?.scopes;
 			if (lastUsedScopes) {

src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts

@@ -18,6 +18,7 @@ import { IAuthenticationUsageService } from './authenticationUsageService.js';
 import { AuthenticationSession, IAuthenticationProvider, IAuthenticationService, IAuthenticationExtensionsService, AuthenticationSessionAccount } from '../common/authentication.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 
 // OAuth2 spec prohibits space in a scope, so use that to join them.
 const SCOPESLIST_SEPARATOR = ' ';
@@ -153,7 +154,8 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 	//#region Account/Session Preference
 
 	updateAccountPreference(extensionId: string, providerId: string, account: AuthenticationSessionAccount): void {
-		const parentExtensionId = this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId;
+		const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+		const parentExtensionId = this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId;
 		const key = this._getKey(parentExtensionId, providerId);
 
 		// Store the preference in the workspace and application storage. This allows new workspaces to
@@ -168,14 +170,16 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 	}
 
 	getAccountPreference(extensionId: string, providerId: string): string | undefined {
-		const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId, providerId);
+		const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+		const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId, providerId);
 
 		// If a preference is set in the workspace, use that. Otherwise, use the global preference.
 		return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
 	}
 
 	removeAccountPreference(extensionId: string, providerId: string): void {
-		const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[extensionId] ?? extensionId, providerId);
+		const realExtensionId = ExtensionIdentifier.toKey(extensionId);
+		const key = this._getKey(this._inheritAuthAccountPreferenceChildToParent[realExtensionId] ?? realExtensionId, providerId);
 
 		// This won't affect any other workspaces that have a preference set, but it will remove the preference
 		// for this workspace and the global preference. This is only paired with a call to updateSessionPreference...
@@ -192,11 +196,12 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 	// TODO@TylerLeonhardt: Remove all of this after a couple iterations
 
 	updateSessionPreference(providerId: string, extensionId: string, session: AuthenticationSession): void {
+		const realExtensionId = ExtensionIdentifier.toKey(extensionId);
 		// The 3 parts of this key are important:
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${session.scopes.join(SCOPESLIST_SEPARATOR)}`;
+		const key = `${realExtensionId}-${providerId}-${session.scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// Store the preference in the workspace and application storage. This allows new workspaces to
 		// have a preference set already to limit the number of prompts that are shown... but also allows
@@ -206,22 +211,24 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 	}
 
 	getSessionPreference(providerId: string, extensionId: string, scopes: string[]): string | undefined {
+		const realExtensionId = ExtensionIdentifier.toKey(extensionId);
 		// The 3 parts of this key are important:
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
+		const key = `${realExtensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// If a preference is set in the workspace, use that. Otherwise, use the global preference.
 		return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
 	}
 
 	removeSessionPreference(providerId: string, extensionId: string, scopes: string[]): void {
+		const realExtensionId = ExtensionIdentifier.toKey(extensionId);
 		// The 3 parts of this key are important:
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
+		const key = `${realExtensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// This won't affect any other workspaces that have a preference set, but it will remove the preference
 		// for this workspace and the global preference. This is only paired with a call to updateSessionPreference...