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

[EC-943] remove deprecated permissions (#4467)

Browse Source 
* [EC-943] remove deprecated permissions

* [EC-943] Remove permissions from OAVR changes
This commit is contained in:
Jake Fink
2023-01-20 11:06:05 -05:00
committed by GitHub
parent e7e5918a68
commit c5e99b807e
3 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/common/src/models/api/permissions.api.ts
View File

@@ -4,19 +4,9 @@ export class PermissionsApi extends BaseResponse {
accessEventLogs: boolean;
accessImportExport: boolean;
accessReports: boolean;
/**
* @deprecated Sep 29 2021: This permission has been split out to `createNewCollections`, `editAnyCollection`, and
* `deleteAnyCollection`. It exists here for backwards compatibility with Server versions <= 1.43.0
*/
manageAllCollections: boolean;
createNewCollections: boolean;
editAnyCollection: boolean;
deleteAnyCollection: boolean;
/**
* @deprecated Sep 29 2021: This permission has been split out to `editAssignedCollections` and
* `deleteAssignedCollections`. It exists here for backwards compatibility with Server versions <= 1.43.0
*/
manageAssignedCollections: boolean;
editAssignedCollections: boolean;
deleteAssignedCollections: boolean;
manageCiphers: boolean;
@@ -36,10 +26,6 @@ export class PermissionsApi extends BaseResponse {
this.accessImportExport = this.getResponseProperty("AccessImportExport");
this.accessReports = this.getResponseProperty("AccessReports");
// For backwards compatibility with Server <= 1.43.0
this.manageAllCollections = this.getResponseProperty("ManageAllCollections");
this.manageAssignedCollections = this.getResponseProperty("ManageAssignedCollections");
this.createNewCollections = this.getResponseProperty("CreateNewCollections");
this.editAnyCollection = this.getResponseProperty("EditAnyCollection");
this.deleteAnyCollection = this.getResponseProperty("DeleteAnyCollection");

24
libs/common/src/models/domain/organization.ts
View File

@@ -131,16 +131,11 @@ export class Organization {
}
get canCreateNewCollections() {
return (
this.isManager ||
(this.permissions.createNewCollections ?? this.permissions.manageAllCollections)
);
return this.isManager || this.permissions.createNewCollections;
}
get canEditAnyCollection() {
return (
this.isAdmin || (this.permissions.editAnyCollection ?? this.permissions.manageAllCollections)
);
return this.isAdmin || this.permissions.editAnyCollection;
}
get canUseAdminCollections() {
@@ -148,10 +143,7 @@ export class Organization {
}
get canDeleteAnyCollection() {
return (
this.isAdmin ||
(this.permissions.deleteAnyCollection ?? this.permissions.manageAllCollections)
);
return this.isAdmin || this.permissions.deleteAnyCollection;
}
get canViewAllCollections() {
@@ -159,17 +151,11 @@ export class Organization {
}
get canEditAssignedCollections() {
return (
this.isManager ||
(this.permissions.editAssignedCollections ?? this.permissions.manageAssignedCollections)
);
return this.isManager || this.permissions.editAssignedCollections;
}
get canDeleteAssignedCollections() {
return (
this.isManager ||
(this.permissions.deleteAssignedCollections ?? this.permissions.manageAssignedCollections)
);
return this.isManager || this.permissions.deleteAssignedCollections;
}
get canViewAssignedCollections() {