ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix account store silently failing (#13956)

Browse Source 
* Fix account store silently failing

* Combine calls

* undo
This commit is contained in:
Charles Gagnon
2021-01-13 16:06:35 -08:00
committed by GitHub
parent 8ef9b1cc1f
commit 452b7d744e
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/sql/platform/accounts/common/accountStore.ts
View File

@@ -38,19 +38,21 @@ export default class AccountStore implements IAccountStore {
});
}
public getAccountsByProvider(providerId: string): Promise<azdata.Account[]> {
return this.doOperation(() => {
return this.readFromMemento()
.then(accounts => accounts.filter(account => account.key.providerId === providerId));
public async getAccountsByProvider(providerId: string): Promise<azdata.Account[]> {
const accounts = await this.doOperation(async () => {
await this.cleanupDeprecatedAccounts();
const accounts = await this.readFromMemento();
return accounts.filter(account => account.key.providerId === providerId);
});
return accounts ?? [];
}
public getAllAccounts(): Promise<azdata.Account[]> {
return this.doOperation(() => {
return this.cleanupDeprecatedAccounts().then(() => {
return this.readFromMemento();
});
public async getAllAccounts(): Promise<azdata.Account[]> {
const accounts = await this.doOperation(async () => {
await this.cleanupDeprecatedAccounts();
return this.readFromMemento();
});
return accounts ?? [];
}
public cleanupDeprecatedAccounts(): Promise<void> {
@@ -114,16 +116,16 @@ export default class AccountStore implements IAccountStore {
target.isStale = source.isStale;
}
private doOperation<T>(op: () => Promise<T>) {
private doOperation<T>(op: () => Promise<T>): Promise<T | undefined> {
// Initialize the active operation to an empty promise if necessary
let activeOperation = this._activeOperation || Promise.resolve<any>(null);
let activeOperation = this._activeOperation || Promise.resolve();
// Chain the operation to perform to the end of the existing promise
activeOperation = activeOperation.then(op);
// Add a catch at the end to make sure we can continue after any errors
activeOperation = activeOperation.then(undefined, (err) => {
// TODO: Log the error
activeOperation = activeOperation.then(undefined, err => {
this.logService.error(err);
});
// Point the current active operation to this one