Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-27 07:39:49 +01:00
Code Issues Projects Releases Wiki Activity

[PM-13790] Remove RefactorOrganizationUserApi feature flag (#11662)

Browse Source
This commit is contained in:
Thomas Rittson 2024-10-25 10:16:59 +10:00 committed by GitHub
parent 877d379f86
commit 55cd435279
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/cli/src/service-container/service-container.ts
View File

@ -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,

17
libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
View File

@ -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`,

2
libs/angular/src/services/jslib-services.module.ts
View File

@ -972,7 +972,7 @@ const safeProviders: SafeProvider[] = [
safeProvider({
provide: OrganizationUserApiService,
useClass: DefaultOrganizationUserApiService,
deps: [ApiServiceAbstraction, ConfigService],
deps: [ApiServiceAbstraction],
}),
safeProvider({
provide: PasswordResetEnrollmentServiceAbstraction,

2
libs/common/src/enums/feature-flag.enum.ts
View File

@ -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,