Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-22 16:29:09 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1340] Fixed cipher restore for provider users by using the restore-admin endpoints (#5255)

Browse Source
This commit is contained in:
Rui Tomé 2023-04-21 12:22:34 +01:00 committed by GitHub
parent 315c4ffc76
commit 89c8c48cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -674,7 +674,8 @@ export class VaultComponent implements OnInit, OnDestroy {
} }
try { try {
await this.cipherService.restoreWithServer(c.id); const asAdmin = this.organization?.canEditAnyCollection;
await this.cipherService.restoreWithServer(c.id, asAdmin);
this.platformUtilsService.showToast("success", null, this.i18nService.t("restoredItem")); this.platformUtilsService.showToast("success", null, this.i18nService.t("restoredItem"));
this.refresh(); this.refresh();
} catch (e) { } catch (e) {

3
libs/angular/src/vault/components/add-edit.component.ts
View File

@ -610,7 +610,8 @@ export class AddEditComponent implements OnInit, OnDestroy {
} }
protected restoreCipher() { protected restoreCipher() {
return this.cipherService.restoreWithServer(this.cipher.id); const asAdmin = this.organization?.canEditAnyCollection;
return this.cipherService.restoreWithServer(this.cipher.id, asAdmin);
} }
get defaultOwnerId(): string | null { get defaultOwnerId(): string | null {

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

@ -75,6 +75,6 @@ export abstract class CipherService {
restore: ( restore: (
cipher: { id: string; revisionDate: string } | { id: string; revisionDate: string }[] cipher: { id: string; revisionDate: string } | { id: string; revisionDate: string }[]
) => Promise<any>; ) => Promise<any>;
restoreWithServer: (id: string) => Promise<any>; restoreWithServer: (id: string, asAdmin?: boolean) => Promise<any>;
restoreManyWithServer: (ids: string[]) => Promise<any>; restoreManyWithServer: (ids: string[]) => Promise<any>;
} }

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

@ -914,8 +914,10 @@ export class CipherService implements CipherServiceAbstraction {
await this.stateService.setEncryptedCiphers(ciphers); await this.stateService.setEncryptedCiphers(ciphers);
} }
async restoreWithServer(id: string): Promise<any> { async restoreWithServer(id: string, asAdmin = false): Promise<any> {
const response = await this.apiService.putRestoreCipher(id); const response = asAdmin
? await this.apiService.putRestoreCipherAdmin(id)
: await this.apiService.putRestoreCipher(id);
await this.restore({ id: id, revisionDate: response.revisionDate }); await this.restore({ id: id, revisionDate: response.revisionDate });
} }