Skip to content

Allow disabling AuthenticationProvider extension for workspace if not used by Settings Sync #320415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gjsjohnmurray wants to merge 6 commits into
base: main
Choose a base branch
from
+11 −6
Open

Allow disabling AuthenticationProvider extension for workspace if not used by Settings Sync #320415

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ff9785
Allow disabling AuthenticationProvider extension for workspace if not…
gjsjohnmurray Jun 8, 2026
d1be979
Adopt Copilot feedback
gjsjohnmurray Jun 8, 2026
580cdc7
Merge branch 'main' into fix-269367v2
gjsjohnmurray Jun 12, 2026
ec28f2f
Merge branch 'main' into fix-269367v2
gjsjohnmurray Jun 17, 2026
a83e68c
Merge branch 'main' into fix-269367v2
gjsjohnmurray Jun 19, 2026
3d45705
Merge branch 'main' into fix-269367v2
gjsjohnmurray Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { areSameExtensions, BetterMergeId, getExtensionDependencies, isMalicious
import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
import { ExtensionType, IExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension } from '../../../../platform/extensions/common/extensions.js';
import { ExtensionType, IExtension, IExtensionManifest, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension } from '../../../../platform/extensions/common/extensions.js';
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
import { StorageManager } from '../../../../platform/extensionManagement/common/extensionEnablementService.js';
Expand Down Expand Up @@ -231,14 +231,18 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
}
}

private isSettingsSyncAuthProviderExtension(manifest: IExtensionManifest): boolean {
return (this.userDataSyncEnablementService.isEnabled() && this.userDataSyncAccountService.account &&
isAuthenticationProviderExtension(manifest) && manifest.contributes!.authentication!.some(a => a.id === this.userDataSyncAccountService.account!.authenticationProviderId)) || false;
}

private throwErrorIfCannotChangeEnablement(extension: IExtension, donotCheckDependencies?: boolean): void {
if (isLanguagePackExtension(extension.manifest)) {
throw new Error(localize('cannot disable language pack extension', "Cannot change enablement of {0} extension because it contributes language packs.", extension.manifest.displayName || extension.identifier.id));
}

if (this.userDataSyncEnablementService.isEnabled() && this.userDataSyncAccountService.account &&
isAuthenticationProviderExtension(extension.manifest) && extension.manifest.contributes!.authentication!.some(a => a.id === this.userDataSyncAccountService.account!.authenticationProviderId)) {
throw new Error(localize('cannot disable auth extension', "Cannot change enablement {0} extension because Settings Sync depends on it.", extension.manifest.displayName || extension.identifier.id));
if (this.isSettingsSyncAuthProviderExtension(extension.manifest)) {
throw new Error(localize('cannot disable settings sync auth extension', "Cannot change enablement of {0} extension because Settings Sync depends on it.", extension.manifest.displayName || extension.identifier.id));
}

if (this._isEnabledInEnv(extension)) {
Expand Down Expand Up @@ -280,8 +284,9 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
if (!this.hasWorkspace) {
throw new Error(localize('noWorkspace', "No workspace."));
}
if (isAuthenticationProviderExtension(extension.manifest)) {
throw new Error(localize('cannot disable auth extension in workspace', "Cannot change enablement of {0} extension in workspace because it contributes authentication providers", extension.manifest.displayName || extension.identifier.id));

if (this.isSettingsSyncAuthProviderExtension(extension.manifest)) {
throw new Error(localize('cannot disable settings sync auth extension in workspace', "Cannot change enablement of {0} extension in workspace because Settings Sync depends on it.", extension.manifest.displayName || extension.identifier.id));
}
}

Expand Down