Skip to content

Commit 0b6da14

Browse files
committed
Add keytar back
1 parent 78809b7 commit 0b6da14

2 files changed

Lines changed: 16 additions & 18 deletions

File tree

npm-shrinkwrap.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vs/platform/credentials/node/credentialsService.ts

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,22 @@
66

77
import { TPromise } from 'vs/base/common/winjs.base';
88
import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
9-
import * as keytarType from 'keytar';
9+
import * as keytar from 'keytar';
1010

1111
export class CredentialsService implements ICredentialsService {
1212

1313
_serviceBrand: any;
1414

15-
private keytarPromise: TPromise<typeof keytarType>;
16-
1715
readSecret(service: string, account: string): TPromise<string | undefined> {
18-
return this.getKeytar()
19-
.then(keytar => TPromise.wrap(keytar.getPassword(service, account)))
16+
return TPromise.wrap(keytar.getPassword(service, account))
2017
.then(result => result === null ? undefined : result);
2118
}
2219

2320
writeSecret(service: string, account: string, secret: string): TPromise<void> {
24-
return this.getKeytar()
25-
.then(keytar => TPromise.wrap(keytar.setPassword(service, account, secret)));
21+
return TPromise.wrap(keytar.setPassword(service, account, secret));
2622
}
2723

2824
deleteSecret(service: string, account: string): TPromise<boolean> {
29-
return this.getKeytar()
30-
.then(keytar => TPromise.wrap(keytar.deletePassword(service, account)));
31-
}
32-
33-
private getKeytar(): TPromise<typeof keytarType> {
34-
if (!this.keytarPromise) {
35-
this.keytarPromise = new TPromise<typeof keytarType>((c, e) => {
36-
require(['keytar'], c, e);
37-
});
38-
}
39-
return this.keytarPromise;
25+
return TPromise.wrap(keytar.deletePassword(service, account));
4026
}
4127
}

0 commit comments

Comments
 (0)