From 04fb7c04c20584c393b042ae5326d57b3a04cce3 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Tue, 28 Nov 2023 14:08:30 +0000
Subject: [PATCH] [AC-1139] Reverted change on syncService

---
 .../src/services/jslib-services.module.ts       |  1 -
 .../src/vault/services/sync/sync.service.ts     | 17 -----------------
 2 files changed, 18 deletions(-)

diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index e841fd5c97d..97d8099b955 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -450,7 +450,6 @@ import { ModalService } from "./modal.service";
         FolderApiServiceAbstraction,
         OrganizationServiceAbstraction,
         SendApiServiceAbstraction,
-        ConfigServiceAbstraction,
         LOGOUT_CALLBACK,
       ],
     },
diff --git a/libs/common/src/vault/services/sync/sync.service.ts b/libs/common/src/vault/services/sync/sync.service.ts
index e995ffe4587..7368d82f731 100644
--- a/libs/common/src/vault/services/sync/sync.service.ts
+++ b/libs/common/src/vault/services/sync/sync.service.ts
@@ -10,7 +10,6 @@ import { ProviderData } from "../../../admin-console/models/data/provider.data";
 import { PolicyResponse } from "../../../admin-console/models/response/policy.response";
 import { KeyConnectorService } from "../../../auth/abstractions/key-connector.service";
 import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-password-reason";
-import { FeatureFlag } from "../../../enums/feature-flag.enum";
 import { DomainsResponse } from "../../../models/response/domains.response";
 import {
   SyncCipherNotification,
@@ -18,7 +17,6 @@ import {
   SyncSendNotification,
 } from "../../../models/response/notification.response";
 import { ProfileResponse } from "../../../models/response/profile.response";
-import { ConfigServiceAbstraction } from "../../../platform/abstractions/config/config.service.abstraction";
 import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { LogService } from "../../../platform/abstractions/log.service";
 import { MessagingService } from "../../../platform/abstractions/messaging.service";
@@ -61,7 +59,6 @@ export class SyncService implements SyncServiceAbstraction {
     private folderApiService: FolderApiServiceAbstraction,
     private organizationService: InternalOrganizationServiceAbstraction,
     private sendApiService: SendApiService,
-    private configService: ConfigServiceAbstraction,
     private logoutCallback: (expired: boolean) => Promise<void>
   ) {}
 
@@ -397,20 +394,6 @@ export class SyncService implements SyncServiceAbstraction {
       }
     });
 
-    // If Flexible Collections is enabled, treat Managers as Users and ignore deprecated permissions
-    if (await this.configService.getFeatureFlag(FeatureFlag.FlexibleCollections)) {
-      Object.values(organizations).forEach((o) => {
-        if (o.type === OrganizationUserType.Manager) {
-          o.type = OrganizationUserType.User;
-        }
-
-        if (o.permissions != null) {
-          o.permissions.editAssignedCollections = false;
-          o.permissions.deleteAssignedCollections = false;
-        }
-      });
-    }
-
     await this.organizationService.replace(organizations);
   }