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

* [EC-943] remove deprecated permissions

* [EC-943] Remove permissions from OAVR changes

apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.ts

@@ -175,15 +175,20 @@ export class MemberDialogComponent implements OnInit, OnDestroy {
           }
           this.isRevoked = userDetails.status === OrganizationUserStatusType.Revoked;
           const assignedCollectionsPermissions = {
-            manageAssignedCollections: userDetails.permissions.manageAssignedCollections,
             editAssignedCollections: userDetails.permissions.editAssignedCollections,
             deleteAssignedCollections: userDetails.permissions.deleteAssignedCollections,
+            manageAssignedCollections:
+              userDetails.permissions.editAssignedCollections &&
+              userDetails.permissions.deleteAssignedCollections,
           };
           const allCollectionsPermissions = {
-            manageAllCollections: userDetails.permissions.manageAllCollections,
             createNewCollections: userDetails.permissions.createNewCollections,
             editAnyCollection: userDetails.permissions.editAnyCollection,
             deleteAnyCollection: userDetails.permissions.deleteAnyCollection,
+            manageAllCollections:
+              userDetails.permissions.createNewCollections &&
+              userDetails.permissions.editAnyCollection &&
+              userDetails.permissions.deleteAnyCollection,
           };
           if (userDetails.type === OrganizationUserType.Custom) {
             this.permissionsGroup.patchValue({
@@ -255,15 +260,11 @@ export class MemberDialogComponent implements OnInit, OnDestroy {
       managePolicies: this.permissionsGroup.value.managePolicies,
       manageUsers: this.permissionsGroup.value.manageUsers,
       manageResetPassword: this.permissionsGroup.value.manageResetPassword,
-      manageAllCollections:
-        this.permissionsGroup.value.manageAllCollectionsGroup.manageAllCollections,
       createNewCollections:
         this.permissionsGroup.value.manageAllCollectionsGroup.createNewCollections,
       editAnyCollection: this.permissionsGroup.value.manageAllCollectionsGroup.editAnyCollection,
       deleteAnyCollection:
         this.permissionsGroup.value.manageAllCollectionsGroup.deleteAnyCollection,
-      manageAssignedCollections:
-        this.permissionsGroup.value.manageAssignedCollectionsGroup.manageAssignedCollections,
       editAssignedCollections:
         this.permissionsGroup.value.manageAssignedCollectionsGroup.editAssignedCollections,
       deleteAssignedCollections:

libs/common/src/models/api/permissions.api.ts

@@ -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");

libs/common/src/models/domain/organization.ts

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