Defer loading of keytar (fixes microsoft#33998)

chrmarti · chrmarti · commit 945e53a03e2e · 2017-09-08T09:52:08.000-07:00
diff --git a/src/vs/platform/credentials/node/credentialsService.ts b/src/vs/platform/credentials/node/credentialsService.ts
@@ -6,22 +6,29 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
-import * as keytar from 'keytar';
 
 export class CredentialsService implements ICredentialsService {
 
 	_serviceBrand: any;
 
 	readSecret(service: string, account: string): TPromise<string | undefined> {
-		return TPromise.wrap(keytar.getPassword(service, account))
+		return this.getKeytar()
+			.then(keytar => TPromise.wrap(keytar.getPassword(service, account)))
 			.then(result => result === null ? undefined : result);
 	}
 
 	writeSecret(service: string, account: string, secret: string): TPromise<void> {
-		return TPromise.wrap(keytar.setPassword(service, account, secret));
+		return this.getKeytar()
+			.then(keytar => TPromise.wrap(keytar.setPassword(service, account, secret)));
 	}
 
 	deleteSecret(service: string, account: string): TPromise<boolean> {
-		return TPromise.wrap(keytar.deletePassword(service, account));
+		return this.getKeytar()
+			.then(keytar => TPromise.wrap(keytar.deletePassword(service, account)));
+	}
+
+	private getKeytar() {
+		// Avoids https://github.com/Microsoft/vscode/issues/33998
+		return TPromise.wrap(import('keytar'));
 	}
 }
