Skip to content

Commit 1ed7421

Browse files
authored
1 parent 52dbc62 commit 1ed7421

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

src/vs/platform/extensionManagement/node/extensionDownloader.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import { ExtensionKey, groupByExtension } from 'vs/platform/extensionManagement/
2222
import { ExtensionSignatureVerificationError, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
2323
import { IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files';
2424
import { ILogService } from 'vs/platform/log/common/log';
25-
import { IProductService } from 'vs/platform/product/common/productService';
2625

2726
export class ExtensionsDownloader extends Disposable {
2827

@@ -37,7 +36,6 @@ export class ExtensionsDownloader extends Disposable {
3736
@IFileService private readonly fileService: IFileService,
3837
@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
3938
@IConfigurationService private readonly configurationService: IConfigurationService,
40-
@IProductService private readonly productService: IProductService,
4139
@IExtensionSignatureVerificationService private readonly extensionSignatureVerificationService: IExtensionSignatureVerificationService,
4240
@ILogService private readonly logService: ILogService,
4341
) {
@@ -94,10 +92,7 @@ export class ExtensionsDownloader extends Disposable {
9492
}
9593

9694
const value = this.configurationService.getValue('extensions.verifySignature');
97-
if (isBoolean(value)) {
98-
return value;
99-
}
100-
return this.productService.quality !== 'stable';
95+
return isBoolean(value) ? value : true;
10196
}
10297

10398
private async downloadSignatureArchive(extension: IGalleryExtension): Promise<URI> {

src/vs/platform/extensionManagement/test/node/installGalleryExtensionTask.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ suite('InstallGalleryExtensionTask Tests', () => {
100100
assert.strictEqual(testObject.installed, true);
101101
});
102102

103-
test('if verification is disabled in stable, the task completes', async () => {
104-
const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: false, verificationResult: 'error', didExecute: true, quality: 'stable' }));
103+
test('if verification is enabled in stable, the task completes', async () => {
104+
const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: true, quality: 'stable' }));
105105

106106
await testObject.run();
107107

108-
assert.strictEqual(testObject.verificationStatus, ExtensionVerificationStatus.Unverified);
108+
assert.strictEqual(testObject.verificationStatus, ExtensionVerificationStatus.Verified);
109109
assert.strictEqual(testObject.installed, true);
110110
});
111111

0 commit comments

Comments
 (0)