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

[AC- 2493] Restore and Delete Unassigned Items (#8983)

Browse Source 
* updates added for single and bulk delete and restore items including unassigned and permissions for owners and custom users
This commit is contained in:
Jason Ng
2024-05-21 12:32:02 -04:00
committed by GitHub
parent dff44b02e2
commit b7463d551c
6 changed files with 109 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/common/src/vault/abstractions/cipher.service.ts
View File

@@ -132,11 +132,7 @@ export abstract class CipherService {
cipher: { id: string; revisionDate: string } | { id: string; revisionDate: string }[],
) => Promise<any>;
restoreWithServer: (id: string, asAdmin?: boolean) => Promise<any>;
restoreManyWithServer: (
ids: string[],
organizationId?: string,
asAdmin?: boolean,
) => Promise<void>;
restoreManyWithServer: (ids: string[], orgId?: string) => Promise<void>;
getKeyForCipherKeyDecryption: (cipher: Cipher) => Promise<any>;
setAddEditCipherInfo: (value: AddEditCipherInfo) => Promise<void>;
}

6
libs/common/src/vault/models/view/cipher.view.ts
View File

@@ -126,6 +126,12 @@ export class CipherView implements View, InitializerMetadata {
return this.item?.linkedFieldOptions;
}
get isUnassigned(): boolean {
return (
this.organizationId != null && (this.collectionIds == null || this.collectionIds.length === 0)
);
}
linkedFieldValue(id: LinkedIdType) {
const linkedFieldOption = this.linkedFieldOptions?.get(id);
if (linkedFieldOption == null) {

15
libs/common/src/vault/services/cipher.service.ts
View File

@@ -1117,14 +1117,15 @@ export class CipherService implements CipherServiceAbstraction {
await this.restore({ id: id, revisionDate: response.revisionDate });
}
async restoreManyWithServer(
ids: string[],
organizationId: string = null,
asAdmin = false,
): Promise<void> {
/**
* No longer using an asAdmin Param. Org Vault bulkRestore will assess if an item is unassigned or editable
* The Org Vault will pass those ids an array as well as the orgId when calling bulkRestore
*/
async restoreManyWithServer(ids: string[], orgId: string = null): Promise<void> {
let response;
if (asAdmin) {
const request = new CipherBulkRestoreRequest(ids, organizationId);
if (orgId) {
const request = new CipherBulkRestoreRequest(ids, orgId);
response = await this.apiService.putRestoreManyCiphersAdmin(request);
} else {
const request = new CipherBulkRestoreRequest(ids);