diff --git a/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.spec.ts index 4b3d3939132..89836982b77 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.spec.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.spec.ts @@ -7,7 +7,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction"; import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { StateProvider } from "@bitwarden/common/platform/state"; import { @@ -35,7 +34,6 @@ describe("InviteLinkCalloutService", () => { const userId = Utils.newGuid() as UserId; let accountService: FakeAccountService; let stateProvider: FakeStateProvider; - let configService: MockProxy; let memberDialogManager: MockProxy; let organizationMembersService: MockProxy; let organizationMetadataService: MockProxy; @@ -64,8 +62,6 @@ describe("InviteLinkCalloutService", () => { beforeEach(() => { accountService = mockAccountServiceWith(userId); stateProvider = new FakeStateProvider(accountService); - configService = mock(); - configService.getFeatureFlag.mockResolvedValue(true); memberDialogManager = mock(); memberDialogManager.openInviteDialog.mockResolvedValue(MemberDialogResult.Saved); organizationMembersService = mock(); @@ -85,7 +81,6 @@ describe("InviteLinkCalloutService", () => { InviteLinkCalloutService, { provide: AccountService, useValue: accountService }, { provide: StateProvider, useValue: stateProvider }, - { provide: ConfigService, useValue: configService }, { provide: MemberDialogManagerService, useValue: memberDialogManager }, { provide: OrganizationMembersService, useValue: organizationMembersService }, { provide: OrganizationMetadataServiceAbstraction, useValue: organizationMetadataService }, @@ -145,15 +140,6 @@ describe("InviteLinkCalloutService", () => { expect(dialogService.open).not.toHaveBeenCalled(); }); - it("showIfEligible() returns early without opening a dialog when the feature flag is disabled", async () => { - configService.getFeatureFlag.mockResolvedValue(false); - const organization = createOrganization(); - - await service.showIfEligible(organization); - - expect(dialogService.open).not.toHaveBeenCalled(); - }); - it("showIfEligible() opens the dialog and calls dismiss() when the user clicks Skip", async () => { const organization = createOrganization(); stubDialogClosed("skip"); diff --git a/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.ts b/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.ts index 686831c95a0..54ccd17163c 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/invite-link-callout/invite-link-callout.service.ts @@ -6,8 +6,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { INVITE_LINK_CALLOUT_DISK, StateProvider, @@ -36,7 +34,6 @@ export const INVITE_LINK_CALLOUT_DISMISSED_KEY = new UserKeyDefinition { - const flag = FeatureFlag.InviteLinkNotification; + const flag = FeatureFlag.InviteLinkAutoConfirm; const userId = "11111111-1111-4111-8111-111111111111" as UserId; let configService: ReturnType>; diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts index 368964c1554..cb4d9ea2a2f 100644 --- a/libs/common/src/enums/feature-flag.enum.ts +++ b/libs/common/src/enums/feature-flag.enum.ts @@ -12,7 +12,6 @@ import { ServerConfig } from "../platform/abstractions/config/server-config"; export enum FeatureFlag { /* Admin Console Team */ CollectionsDecryptListFailures = "pm-43375-collections-decrypt-list-failures", - InviteLinkNotification = "pm-39601-invite-link-notification", InviteLinkAutoConfirm = "pm-34429-invite-link-auto-confirm", GroupsComponentRefactor = "pm-43419-groups-table-v2", MembersTableV2 = "pm-37463-members-table-v2", @@ -126,7 +125,6 @@ const FALSE = false as boolean; export const DefaultFeatureFlagValue = { /* Admin Console Team */ [FeatureFlag.CollectionsDecryptListFailures]: FALSE, - [FeatureFlag.InviteLinkNotification]: FALSE, [FeatureFlag.InviteLinkAutoConfirm]: FALSE, [FeatureFlag.GroupsComponentRefactor]: FALSE, [FeatureFlag.MembersTableV2]: FALSE,