bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

Do not export trashed items (#241)

Browse Source 
* Do not export trashed items

* Test Item exporting

Does not test organization export. Export's use of apiService is not
very testable. We will either need a testApiService or to refactor
apiService to make mocking easier.

* Linter fixes
This commit is contained in:
Matt Gibson
2020-12-30 15:08:02 -06:00
committed by GitHub
parent 48144a7eae
commit 1420082348
5 changed files with 155 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/services/export.service.ts
View File

@@ -64,7 +64,7 @@ export class ExportService implements ExportServiceAbstraction {
}));
promises.push(this.cipherService.getAllDecrypted().then((ciphers) => {
decCiphers = ciphers;
decCiphers = ciphers.filter(f => f.deletedDate == null);
}));
await Promise.all(promises);
@@ -127,8 +127,19 @@ export class ExportService implements ExportServiceAbstraction {
}
private async getEncryptedExport(): Promise<string> {
const folders = await this.folderService.getAll();
const ciphers = await this.cipherService.getAll();
let folders: Folder[] = [];
let ciphers: Cipher[] = [];
const promises = [];
promises.push(this.folderService.getAll().then((f) => {
folders = f;
}));
promises.push(this.cipherService.getAll().then((c) => {
ciphers = c.filter((f) => f.deletedDate == null);
}));
await Promise.all(promises);
const jsonDoc: any = {
encrypted: true,
@@ -179,7 +190,7 @@ export class ExportService implements ExportServiceAbstraction {
promises.push(this.apiService.getCiphersOrganization(organizationId).then((ciphers) => {
const cipherPromises: any = [];
if (ciphers != null && ciphers.data != null && ciphers.data.length > 0) {
ciphers.data.forEach((c) => {
ciphers.data.filter((c) => c.deletedDate === null).forEach((c) => {
const cipher = new Cipher(new CipherData(c));
cipherPromises.push(cipher.decrypt().then((decCipher) => {
decCiphers.push(decCipher);
@@ -256,8 +267,8 @@ export class ExportService implements ExportServiceAbstraction {
promises.push(this.apiService.getCiphersOrganization(organizationId).then((c) => {
const cipherPromises: any = [];
if (c != null && c.data != null && c.data.length > 0) {
c.data.forEach((r) => {
const cipher = new Cipher(new CipherData(r));
c.data.filter((item) => item.deletedDate === null).forEach((item) => {
const cipher = new Cipher(new CipherData(item));
ciphers.push(cipher);
});
}