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

[AC-2285] Edit Unassigned Ciphers in AC Bug (#8410)

Browse Source 
* check if cipher is unassigned and call the proper service between cipherService get and apiService get. also check for custom user permissions
This commit is contained in:
Jason Ng 2024-03-26 15:22:35 -04:00 committed by GitHub
parent 1e75f24671
commit 7f55833974
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/web/src/app/vault/org-vault/add-edit.component.ts
View File

@ -105,8 +105,14 @@ export class AddEditComponent extends BaseAddEditComponent {
}
protected async loadCipher() {
if (!this.organization.canEditAllCiphers(this.flexibleCollectionsV1Enabled)) {
return await super.loadCipher();
// Calling loadCipher first to assess if the cipher is unassigned. If null use apiService getCipherAdmin
const firstCipherCheck = await super.loadCipher();
if (
!this.organization.canEditAllCiphers(this.flexibleCollectionsV1Enabled) &&
firstCipherCheck != null
) {
return firstCipherCheck;
}
const response = await this.apiService.getCipherAdmin(this.cipherId);
const data = new CipherData(response);

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

@ -650,11 +650,11 @@ export class AddEditComponent implements OnInit, OnDestroy {
protected saveCipher(cipher: Cipher) {
const isNotClone = this.editMode && !this.cloneMode;
let orgAdmin = this.organization?.isAdmin;
let orgAdmin = this.organization?.canEditAllCiphers(this.flexibleCollectionsV1Enabled);
if (this.flexibleCollectionsV1Enabled) {
// Flexible Collections V1 restricts admins, check the organization setting via canEditAllCiphers
orgAdmin = this.organization?.canEditAllCiphers(true);
// if a cipher is unassigned we want to check if they are an admin or have permission to edit any collection
if (!cipher.collectionIds) {
orgAdmin = this.organization?.canEditAnyCollection;
}
return this.cipher.id == null

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

@ -1387,7 +1387,6 @@ export class CipherService implements CipherServiceAbstraction {
cipher.attachments = attachments;
}),
]);
return cipher;
}