@@ -16,6 +18,8 @@ import { GearIcon } from "@bitwarden/assets/svg";
standalone: false,
})
export class SubscriptionHiddenComponent {
+ // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+ // eslint-disable-next-line @angular-eslint/prefer-signals
@Input() providerName: string;
gearIcon = GearIcon;
}
diff --git a/apps/web/src/app/billing/organizations/subscription-status.component.ts b/apps/web/src/app/billing/organizations/subscription-status.component.ts
index 0b59df3f707..54a309a441b 100644
--- a/apps/web/src/app/billing/organizations/subscription-status.component.ts
+++ b/apps/web/src/app/billing/organizations/subscription-status.component.ts
@@ -23,13 +23,19 @@ type ComponentData = {
};
};
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
selector: "app-subscription-status",
templateUrl: "subscription-status.component.html",
standalone: false,
})
export class SubscriptionStatusComponent {
+ // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+ // eslint-disable-next-line @angular-eslint/prefer-signals
@Input({ required: true }) organizationSubscriptionResponse: OrganizationSubscriptionResponse;
+ // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+ // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
@Output() reinstatementRequested = new EventEmitter
();
constructor(
diff --git a/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts b/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts
index 8390e432236..debac3cb2f7 100644
--- a/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts
+++ b/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts
@@ -8,6 +8,8 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
import { OrganizationWarningsService } from "../services";
import { OrganizationFreeTrialWarning } from "../types";
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
selector: "app-organization-free-trial-warning",
template: `
@@ -36,8 +38,14 @@ import { OrganizationFreeTrialWarning } from "../types";
imports: [BannerModule, SharedModule],
})
export class OrganizationFreeTrialWarningComponent implements OnInit {
+ // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+ // eslint-disable-next-line @angular-eslint/prefer-signals
@Input({ required: true }) organization!: Organization;
+ // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+ // eslint-disable-next-line @angular-eslint/prefer-signals
@Input() includeOrganizationNameInMessaging = false;
+ // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+ // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
@Output() clicked = new EventEmitter();
warning$!: Observable;
diff --git a/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts b/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts
index c49f59f6b05..e9850b55c9e 100644
--- a/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts
+++ b/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts
@@ -8,6 +8,8 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
import { OrganizationWarningsService } from "../services";
import { OrganizationResellerRenewalWarning } from "../types";
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
selector: "app-organization-reseller-renewal-warning",
template: `
@@ -27,6 +29,8 @@ import { OrganizationResellerRenewalWarning } from "../types";
imports: [BannerModule, SharedModule],
})
export class OrganizationResellerRenewalWarningComponent implements OnInit {
+ // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+ // eslint-disable-next-line @angular-eslint/prefer-signals
@Input({ required: true }) organization!: Organization;
warning$!: Observable;
diff --git a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
index 8c2a7634264..9466e813e4d 100644
--- a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
+++ b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
@@ -16,6 +16,7 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
import { ProductTierType } from "@bitwarden/common/billing/enums";
import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { DialogRef, DialogService } from "@bitwarden/components";
import { OrganizationBillingClient } from "@bitwarden/web-vault/app/billing/clients";
import {
@@ -37,6 +38,7 @@ describe("OrganizationWarningsService", () => {
let i18nService: MockProxy;
let organizationApiService: MockProxy;
let organizationBillingClient: MockProxy;
+ let platformUtilsService: MockProxy;
let router: MockProxy;
const organization = {
@@ -58,10 +60,13 @@ describe("OrganizationWarningsService", () => {
i18nService = mock();
organizationApiService = mock();
organizationBillingClient = mock();
+ platformUtilsService = mock();
router = mock();
(openChangePlanDialog as jest.Mock).mockReset();
+ platformUtilsService.isSelfHost.mockReturnValue(false);
+
i18nService.t.mockImplementation((key: string, ...args: any[]) => {
switch (key) {
case "freeTrialEndPromptCount":
@@ -94,6 +99,7 @@ describe("OrganizationWarningsService", () => {
{ provide: I18nService, useValue: i18nService },
{ provide: OrganizationApiServiceAbstraction, useValue: organizationApiService },
{ provide: OrganizationBillingClient, useValue: organizationBillingClient },
+ { provide: PlatformUtilsService, useValue: platformUtilsService },
{ provide: Router, useValue: router },
],
});
@@ -111,6 +117,16 @@ describe("OrganizationWarningsService", () => {
});
});
+ it("should return null when platform is self-hosted", (done) => {
+ platformUtilsService.isSelfHost.mockReturnValue(true);
+
+ service.getFreeTrialWarning$(organization).subscribe((result) => {
+ expect(result).toBeNull();
+ expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+ done();
+ });
+ });
+
it("should return warning with count message when remaining trial days >= 2", (done) => {
const warning = { remainingTrialDays: 5 };
organizationBillingClient.getWarnings.mockResolvedValue({
@@ -206,6 +222,16 @@ describe("OrganizationWarningsService", () => {
});
});
+ it("should return null when platform is self-hosted", (done) => {
+ platformUtilsService.isSelfHost.mockReturnValue(true);
+
+ service.getResellerRenewalWarning$(organization).subscribe((result) => {
+ expect(result).toBeNull();
+ expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+ done();
+ });
+ });
+
it("should return upcoming warning with correct type and message", (done) => {
const renewalDate = new Date(2024, 11, 31);
const warning = {
@@ -298,6 +324,16 @@ describe("OrganizationWarningsService", () => {
});
});
+ it("should return null when platform is self-hosted", (done) => {
+ platformUtilsService.isSelfHost.mockReturnValue(true);
+
+ service.getTaxIdWarning$(organization).subscribe((result) => {
+ expect(result).toBeNull();
+ expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+ done();
+ });
+ });
+
it("should return tax_id_missing type when tax ID is missing", (done) => {
const warning = { type: TaxIdWarningTypes.Missing };
organizationBillingClient.getWarnings.mockResolvedValue({
@@ -427,6 +463,16 @@ describe("OrganizationWarningsService", () => {
});
});
+ it("should not show dialog when platform is self-hosted", (done) => {
+ platformUtilsService.isSelfHost.mockReturnValue(true);
+
+ service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+ expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+ expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+ done();
+ });
+ });
+
it("should show contact provider dialog for contact_provider resolution", (done) => {
const warning = { resolution: "contact_provider" };
organizationBillingClient.getWarnings.mockResolvedValue({
@@ -570,6 +616,18 @@ describe("OrganizationWarningsService", () => {
});
});
+ it("should not show dialog when platform is self-hosted", (done) => {
+ platformUtilsService.isSelfHost.mockReturnValue(true);
+
+ service.showSubscribeBeforeFreeTrialEndsDialog$(organization).subscribe({
+ complete: () => {
+ expect(organizationApiService.getSubscription).not.toHaveBeenCalled();
+ expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+ done();
+ },
+ });
+ });
+
it("should open trial payment dialog when free trial warning exists", (done) => {
const warning = { remainingTrialDays: 2 };
const subscription = { id: "sub-123" } as OrganizationSubscriptionResponse;
diff --git a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
index 8bec7acffe1..a34533bcada 100644
--- a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
+++ b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
@@ -8,6 +8,7 @@ import {
map,
merge,
Observable,
+ of,
Subject,
switchMap,
tap,
@@ -17,6 +18,7 @@ import { take } from "rxjs/operators";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { OrganizationId } from "@bitwarden/common/types/guid";
import { DialogService } from "@bitwarden/components";
import { OrganizationBillingClient } from "@bitwarden/web-vault/app/billing/clients";
@@ -56,6 +58,7 @@ export class OrganizationWarningsService {
private i18nService: I18nService,
private organizationApiService: OrganizationApiServiceAbstraction,
private organizationBillingClient: OrganizationBillingClient,
+ private platformUtilsService: PlatformUtilsService,
private router: Router,
) {}
@@ -281,12 +284,17 @@ export class OrganizationWarningsService {
organization: Organization,
extract: (response: OrganizationWarningsResponse) => T | null | undefined,
bypassCache: boolean = false,
- ): Observable =>
- this.readThroughWarnings$(organization, bypassCache).pipe(
+ ): Observable => {
+ if (this.platformUtilsService.isSelfHost()) {
+ return of(null);
+ }
+
+ return this.readThroughWarnings$(organization, bypassCache).pipe(
map((response) => {
const value = extract(response);
return value ? value : null;
}),
take(1),
);
+ };
}
diff --git a/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts b/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
index a83a00e8158..1bc08159cdf 100644
--- a/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
+++ b/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
@@ -52,6 +52,8 @@ const positiveNumberValidator =
return null;
};
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
template: `