bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00
Code Issues Releases Wiki Activity

fix bulk restore for unassigned items (#15533)

Browse Source
This commit is contained in:
Brandon Treston
2025-07-14 15:50:13 -04:00
committed by GitHub
parent e382bd6156
commit 4f84d6b0f6
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web/src/app/admin-console/organizations/collections/vault.component.ts
View File

@@ -1068,6 +1068,7 @@ export class VaultComponent implements OnInit, OnDestroy {
if (unassignedCiphers.length > 0 || editAccessCiphers.length > 0) {
await this.cipherService.restoreManyWithServer(
[...unassignedCiphers, ...editAccessCiphers],
this.userId,
this.organization.id,
);
}

3
apps/web/src/app/vault/individual-vault/vault.component.ts
View File

@@ -1029,7 +1029,8 @@ export class VaultComponent implements OnInit, OnDestroy {
return;
}
await this.cipherService.restoreManyWithServer(selectedCipherIds);
const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
await this.cipherService.restoreManyWithServer(selectedCipherIds, activeUserId);
this.toastService.showToast({
variant: "success",
title: null,

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

@@ -209,7 +209,7 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
userId: UserId,
): Promise<any>;
abstract restoreWithServer(id: string, userId: UserId, asAdmin?: boolean): Promise<any>;
abstract restoreManyWithServer(ids: string[], orgId?: string): Promise<void>;
abstract restoreManyWithServer(ids: string[], userId: UserId, orgId?: string): Promise<void>;
abstract getKeyForCipherKeyDecryption(cipher: Cipher, userId: UserId): Promise<any>;
abstract setAddEditCipherInfo(value: AddEditCipherInfo, userId: UserId): Promise<void>;
/**

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

@@ -1336,7 +1336,7 @@ export class CipherService implements CipherServiceAbstraction {
* 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[], userId: UserId, orgId: string = null): Promise<void> {
async restoreManyWithServer(ids: string[], userId: UserId, orgId?: string): Promise<void> {
let response;
if (orgId) {