make getAllDecrypted synchronous

This commit is contained in:
Kyle Spearrin 2018-07-18 22:47:55 -04:00
parent e555536f24
commit 51ee0b065a
3 changed files with 9 additions and 17 deletions

View File

@ -181,13 +181,10 @@ export class CipherService implements CipherServiceAbstraction {
throw new Error('No key.'); throw new Error('No key.');
} }
const promises: any[] = [];
const ciphers = await this.getAll(); const ciphers = await this.getAll();
ciphers.forEach((cipher) => { for (let i = 0; i < ciphers.length; i++) {
promises.push(cipher.decrypt().then((c) => decCiphers.push(c))); decCiphers.push(await ciphers[i].decrypt());
}); }
await Promise.all(promises);
decCiphers.sort(this.getLocaleSortingFunction()); decCiphers.sort(this.getLocaleSortingFunction());
this.decryptedCipherCache = decCiphers; this.decryptedCipherCache = decCiphers;
return this.decryptedCipherCache; return this.decryptedCipherCache;

View File

@ -48,11 +48,9 @@ export class CollectionService implements CollectionServiceAbstraction {
return []; return [];
} }
const decCollections: CollectionView[] = []; const decCollections: CollectionView[] = [];
const promises: Array<Promise<any>> = []; for (let i = 0; i < collections.length; i++) {
collections.forEach((collection) => { decCollections.push(await collections[i].decrypt());
promises.push(collection.decrypt().then((c) => decCollections.push(c))); }
});
await Promise.all(promises);
return decCollections.sort(Utils.getSortFunction(this.i18nService, 'name')); return decCollections.sort(Utils.getSortFunction(this.i18nService, 'name'));
} }

View File

@ -78,13 +78,10 @@ export class FolderService implements FolderServiceAbstraction {
} }
const decFolders: FolderView[] = []; const decFolders: FolderView[] = [];
const promises: Array<Promise<any>> = [];
const folders = await this.getAll(); const folders = await this.getAll();
folders.forEach((folder) => { for (let i = 0; i < folders.length; i++) {
promises.push(folder.decrypt().then((f) => decFolders.push(f))); decFolders.push(await folders[i].decrypt());
}); }
await Promise.all(promises);
decFolders.sort(Utils.getSortFunction(this.i18nService, 'name')); decFolders.sort(Utils.getSortFunction(this.i18nService, 'name'));
const noneFolder = new FolderView(); const noneFolder = new FolderView();