bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-15 15:53:51 +00:00
Code Issues Releases Wiki Activity

Remove decrypt from folder service

Browse Source
This commit is contained in:
Hinton
2022-04-21 09:50:00 +02:00
parent db2c75ae61
commit 8112d3c530
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/services/folder.service.ts
View File

@@ -9,7 +9,6 @@ import { Utils } from "../misc/utils";
import { CipherData } from "../models/data/cipherData"; import { CipherData } from "../models/data/cipherData";
import { FolderData } from "../models/data/folderData"; import { FolderData } from "../models/data/folderData";
import { Folder } from "../models/domain/folder"; import { Folder } from "../models/domain/folder";
import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
import { TreeNode } from "../models/domain/treeNode"; import { TreeNode } from "../models/domain/treeNode";
import { FolderRequest } from "../models/request/folderRequest"; import { FolderRequest } from "../models/request/folderRequest";
import { FolderResponse } from "../models/response/folderResponse"; import { FolderResponse } from "../models/response/folderResponse";
@@ -30,15 +29,6 @@ export class FolderService implements FolderServiceAbstraction {
await this.stateService.setDecryptedFolders(null, { userId: userId }); await this.stateService.setDecryptedFolders(null, { userId: userId });
} }
async decrypt(model: Folder, key?: SymmetricCryptoKey): Promise<FolderView> {
const view = new FolderView();
view.id = model.id;
view.name = await model.name.decrypt(null, key);
view.revisionDate = model.revisionDate;
return view;
}
async get(id: string): Promise<Folder> { async get(id: string): Promise<Folder> {
const folders = await this.stateService.getEncryptedFolders(); const folders = await this.stateService.getEncryptedFolders();
@@ -66,7 +56,9 @@ export class FolderService implements FolderServiceAbstraction {
const promises: Promise<any>[] = []; const promises: Promise<any>[] = [];
const folders = await this.getAll(); const folders = await this.getAll();
folders.forEach((folder) => { folders.forEach((folder) => {
promises.push(this.decrypt(folder).then((f) => decFolders.push(f))); promises.push(
FolderView.fromFolder(this.cryptoService, folder).then((f) => decFolders.push(f))
);
}); });
await Promise.all(promises); await Promise.all(promises);