fix disabling for a publisher associated to org (microsoft#199059)

Author: sandy081

src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts

@@ -1542,24 +1542,32 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			return;
 		}
 
-		const autoUpdateExtensions = this.getSelectedExtensionsToAutoUpdate();
 		let update = false;
+		const autoUpdateExtensions = this.getSelectedExtensionsToAutoUpdate();
 		if (isString(extensionOrPublisher)) {
 			if (EXTENSION_IDENTIFIER_REGEX.test(extensionOrPublisher)) {
 				throw new Error('Expected publisher string, found extension identifier');
 			}
 			extensionOrPublisher = extensionOrPublisher.toLowerCase();
-			if (autoUpdateExtensions.includes(extensionOrPublisher) !== enable) {
+			if (this.isAutoUpdateEnabledFor(extensionOrPublisher) !== enable) {
 				update = true;
 				if (enable) {
 					autoUpdateExtensions.push(extensionOrPublisher);
 				} else {
-					autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(extensionOrPublisher), 1);
+					if (autoUpdateExtensions.includes(extensionOrPublisher)) {
+						autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(extensionOrPublisher), 1);
+					}
+					const publisherOrganization = this.organizationByPublisher.get(extensionOrPublisher);
+					if (publisherOrganization) {
+						for (const publisher of this.productService.publishersByOrganisation?.[publisherOrganization] ?? []) {
+							autoUpdateExtensions.splice(autoUpdateExtensions.indexOf(publisher), 1);
+						}
+					}
 				}
 			}
 		} else {
 			const extensionId = extensionOrPublisher.identifier.id.toLowerCase();
-			const enableAutoUpdatesForPublisher = autoUpdateExtensions.includes(extensionOrPublisher.publisher.toLowerCase());
+			const enableAutoUpdatesForPublisher = this.isAutoUpdateEnabledFor(extensionOrPublisher.publisher.toLowerCase());
 			const enableAutoUpdatesForExtension = autoUpdateExtensions.includes(extensionId);
 			const disableAutoUpdatesForExtension = autoUpdateExtensions.includes(`-${extensionId}`);
 

src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts

@@ -1650,6 +1650,31 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		assert.strictEqual(testObject.isAutoUpdateEnabledFor(testObject.local[2]), false);
 	});
 
+	test('Test disable auto update for publisher disables for the associated organisation', async () => {
+		stubConfiguration('onlySelectedExtensions');
+		stubProductConfiguration({ publishersByOrganisation: { 'org1': ['pub', 'pub1'] } });
+
+		const extension1 = aLocalExtension('a', undefined, { pinned: true });
+		const extension2 = aLocalExtension('b', { publisher: 'pub1' }, { pinned: true });
+		const extension3 = aLocalExtension('a', { publisher: 'pub2' }, { pinned: true });
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extension1, extension2, extension3]);
+		instantiationService.stub(IExtensionManagementService, 'updateMetadata', (local: ILocalExtension, metadata: Partial<Metadata>) => {
+			local.pinned = !!metadata.pinned;
+			return local;
+		});
+		testObject = await aWorkbenchService();
+
+		await testObject.updateAutoUpdateEnablementFor(testObject.local[0].publisher, true);
+		await testObject.updateAutoUpdateEnablementFor(testObject.local[1].publisher, false);
+
+		assert.strictEqual(testObject.isAutoUpdateEnabledFor('pub'), false);
+		assert.strictEqual(testObject.isAutoUpdateEnabledFor('pub1'), false);
+		assert.strictEqual(testObject.isAutoUpdateEnabledFor('pub2'), false);
+		assert.strictEqual(testObject.isAutoUpdateEnabledFor(testObject.local[0]), false);
+		assert.strictEqual(testObject.isAutoUpdateEnabledFor(testObject.local[1]), false);
+		assert.strictEqual(testObject.isAutoUpdateEnabledFor(testObject.local[2]), false);
+	});
+
 	async function aWorkbenchService(): Promise<ExtensionsWorkbenchService> {
 		const workbenchService: ExtensionsWorkbenchService = disposableStore.add(instantiationService.createInstance(ExtensionsWorkbenchService));
 		await workbenchService.queryLocal();