bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-09 03:53:53 +00:00
Code Issues Releases Wiki Activity

[PM-10996] Remove restrict-provider-access feature flag (#10977)

Browse Source
This commit is contained in:
Shane Melton
2024-09-11 10:45:23 -07:00
committed by GitHub
parent db9003458b
commit 8e4dab5eba
23 changed files with 53 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
View File

@@ -34,7 +34,6 @@ export class VaultCollectionRowComponent {
@Input() organizations: Organization[];
@Input() groups: GroupView[];
@Input() showPermissionsColumn: boolean;
@Input() restrictProviderAccess: boolean;
@Output() onEvent = new EventEmitter<VaultItemEvent>();
@@ -74,10 +73,7 @@ export class VaultCollectionRowComponent {
}
get permissionText() {
if (
this.collection.id == Unassigned &&
this.organization?.canEditUnassignedCiphers(this.restrictProviderAccess)
) {
if (this.collection.id == Unassigned && this.organization?.canEditUnassignedCiphers) {
return this.i18nService.t("canEdit");
}
if ((this.collection as CollectionAdminView).assigned) {

1
apps/web/src/app/vault/components/vault-items/vault-items.component.html
View File

@@ -106,7 +106,6 @@
[canDeleteCollection]="canDeleteCollection(item.collection)"
[canEditCollection]="canEditCollection(item.collection)"
[canViewCollectionInfo]="canViewCollectionInfo(item.collection)"
[restrictProviderAccess]="restrictProviderAccess"
[checked]="selection.isSelected(item)"
(checkedToggled)="selection.toggle(item)"
(onEvent)="event($event)"

9
apps/web/src/app/vault/components/vault-items/vault-items.component.ts
View File

@@ -46,7 +46,6 @@ export class VaultItemsComponent {
@Input() viewingOrgVault: boolean;
@Input() addAccessStatus: number;
@Input() addAccessToggle: boolean;
@Input() restrictProviderAccess: boolean;
@Input() vaultBulkManagementActionEnabled = false;
@Input() activeCollection: CollectionView | undefined;
@@ -213,10 +212,7 @@ export class VaultItemsComponent {
}
const organization = this.allOrganizations.find((o) => o.id === cipher.organizationId);
return (
(organization.canEditAllCiphers(this.restrictProviderAccess) && this.viewingOrgVault) ||
cipher.edit
);
return (organization.canEditAllCiphers && this.viewingOrgVault) || cipher.edit;
}
protected canManageCollection(cipher: CipherView) {
@@ -306,8 +302,7 @@ export class VaultItemsComponent {
const [orgId] = uniqueCipherOrgIds;
const organization = this.allOrganizations.find((o) => o.id === orgId);
const canEditOrManageAllCiphers =
organization?.canEditAllCiphers(this.restrictProviderAccess) && this.viewingOrgVault;
const canEditOrManageAllCiphers = organization?.canEditAllCiphers && this.viewingOrgVault;
const collectionNotSelected =
this.selection.selected.filter((item) => item.collection).length === 0;