From 55cd4352790b6c865ae7f7db356148c3d413b0f3 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:16:59 +1000
Subject: [PATCH] [PM-13790] Remove RefactorOrganizationUserApi feature flag
 (#11662)

---
 .../src/service-container/service-container.ts  |  5 +----
 .../default-organization-user-api.service.ts    | 17 +----------------
 .../src/services/jslib-services.module.ts       |  2 +-
 libs/common/src/enums/feature-flag.enum.ts      |  2 --
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index 48f4e17b34..3424e3fb28 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -810,10 +810,7 @@ export class ServiceContainer {
 
     this.providerApiService = new ProviderApiService(this.apiService);
 
-    this.organizationUserApiService = new DefaultOrganizationUserApiService(
-      this.apiService,
-      this.configService,
-    );
+    this.organizationUserApiService = new DefaultOrganizationUserApiService(this.apiService);
 
     this.cipherAuthorizationService = new DefaultCipherAuthorizationService(
       this.collectionService,
diff --git a/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts b/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
index a6438b8b5f..6a9911e732 100644
--- a/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
+++ b/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
@@ -1,9 +1,5 @@
-import { firstValueFrom } from "rxjs";
-
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { OrganizationUserApiService } from "../abstractions";
 import {
@@ -27,10 +23,7 @@ import {
 } from "../models/responses";
 
 export class DefaultOrganizationUserApiService implements OrganizationUserApiService {
-  constructor(
-    private apiService: ApiService,
-    private configService: ConfigService,
-  ) {}
+  constructor(private apiService: ApiService) {}
 
   async getOrganizationUser(
     organizationId: string,
@@ -95,14 +88,6 @@ export class DefaultOrganizationUserApiService implements OrganizationUserApiSer
   async getAllMiniUserDetails(
     organizationId: string,
   ): Promise<ListResponse<OrganizationUserUserMiniResponse>> {
-    const apiEnabled = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.Pm3478RefactorOrganizationUserApi),
-    );
-    if (!apiEnabled) {
-      // Keep using the old api until this feature flag is enabled
-      return this.getAllUsers(organizationId);
-    }
-
     const r = await this.apiService.send(
       "GET",
       `/organizations/${organizationId}/users/mini-details`,
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 444fb55dee..5d8822866d 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -972,7 +972,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: OrganizationUserApiService,
     useClass: DefaultOrganizationUserApiService,
-    deps: [ApiServiceAbstraction, ConfigService],
+    deps: [ApiServiceAbstraction],
   }),
   safeProvider({
     provide: PasswordResetEnrollmentServiceAbstraction,
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 905d729948..84cf5ed521 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -33,7 +33,6 @@ export enum FeatureFlag {
   CipherKeyEncryption = "cipher-key-encryption",
   VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint",
   PM11901_RefactorSelfHostingLicenseUploader = "PM-11901-refactor-self-hosting-license-uploader",
-  Pm3478RefactorOrganizationUserApi = "pm-3478-refactor-organizationuser-api",
   AccessIntelligence = "pm-13227-access-intelligence",
   Pm13322AddPolicyDefinitions = "pm-13322-add-policy-definitions",
   LimitCollectionCreationDeletionSplit = "pm-10863-limit-collection-creation-deletion-split",
@@ -80,7 +79,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.CipherKeyEncryption]: FALSE,
   [FeatureFlag.VerifiedSsoDomainEndpoint]: FALSE,
   [FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader]: FALSE,
-  [FeatureFlag.Pm3478RefactorOrganizationUserApi]: FALSE,
   [FeatureFlag.AccessIntelligence]: FALSE,
   [FeatureFlag.Pm13322AddPolicyDefinitions]: FALSE,
   [FeatureFlag.LimitCollectionCreationDeletionSplit]: FALSE,