Skip to content

Commit 7051cd2

Browse files
Don't cache keytar until we know it works (microsoft#148567)
1 parent 72ddb69 commit 7051cd2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/vs/platform/credentials/common/credentialsMainService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export abstract class BaseCredentialsMainService extends Disposable implements I
101101
return;
102102
} catch (e) {
103103
error = e;
104-
this.logService.warn('Error attempting to set a password: ', e);
104+
this.logService.warn('Error attempting to set a password: ', e?.message ?? e);
105105
attempts++;
106106
await new Promise(resolve => setTimeout(resolve, 200));
107107
}

src/vs/platform/credentials/electron-main/credentialsMainService.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ export class CredentialsNativeMainService extends BaseCredentialsMainService {
3636
return this._keytarCache;
3737
}
3838

39-
this._keytarCache = await import('keytar');
39+
const keytarCache = await import('keytar');
4040
// Try using keytar to see if it throws or not.
41-
await this._keytarCache.findCredentials('test-keytar-loads');
41+
await keytarCache.findCredentials('test-keytar-loads');
42+
this._keytarCache = keytarCache;
4243
return this._keytarCache;
4344
}
4445

0 commit comments

Comments
 (0)