bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00
Code Issues Releases Wiki Activity

[PM-26628] Refresh inactive subscription warning after restarting subscription (#16791)

Browse Source 
* Refresh inactive subscription warning after restarting subscription

* Fix tests
This commit is contained in:
Alex Morask
2025-10-08 13:14:29 -05:00
committed by GitHub
parent 8a88bd767e
commit 47134508da
3 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
View File

@@ -50,6 +50,7 @@ import {
SubscriberBillingClient,
TaxClient,
} from "@bitwarden/web-vault/app/billing/clients";
import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
import {
EnterBillingAddressComponent,
EnterPaymentMethodComponent,
@@ -221,6 +222,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
private billingNotificationService: BillingNotificationService,
private subscriberBillingClient: SubscriberBillingClient,
private taxClient: TaxClient,
private organizationWarningsService: OrganizationWarningsService,
) {}
async ngOnInit(): Promise<void> {
@@ -808,6 +810,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
paymentMethod,
billingAddress,
);
this.organizationWarningsService.refreshInactiveSubscriptionWarning();
}
private async updateOrganization() {

128
apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
View File

@@ -421,11 +421,9 @@ describe("OrganizationWarningsService", () => {
it("should not show dialog when no inactive subscription warning exists", (done) => {
organizationBillingClient.getWarnings.mockResolvedValue({} as OrganizationWarningsResponse);
service.showInactiveSubscriptionDialog$(organization).subscribe({
complete: () => {
expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
done();
},
service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
done();
});
});
@@ -437,20 +435,18 @@ describe("OrganizationWarningsService", () => {
dialogService.openSimpleDialog.mockResolvedValue(true);
service.showInactiveSubscriptionDialog$(organization).subscribe({
complete: () => {
expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
title: "Test Organization subscription suspended",
content: {
key: "suspendedManagedOrgMessage",
placeholders: ["Test Reseller Inc"],
},
type: "danger",
acceptButtonText: "Close",
cancelButtonText: null,
});
done();
},
service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
title: "Test Organization subscription suspended",
content: {
key: "suspendedManagedOrgMessage",
placeholders: ["Test Reseller Inc"],
},
type: "danger",
acceptButtonText: "Close",
cancelButtonText: null,
});
done();
});
});
@@ -463,21 +459,19 @@ describe("OrganizationWarningsService", () => {
dialogService.openSimpleDialog.mockResolvedValue(true);
router.navigate.mockResolvedValue(true);
service.showInactiveSubscriptionDialog$(organization).subscribe({
complete: () => {
expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
title: "Test Organization subscription suspended",
content: { key: "suspendedOwnerOrgMessage" },
type: "danger",
acceptButtonText: "Continue",
cancelButtonText: "Close",
});
expect(router.navigate).toHaveBeenCalledWith(
["organizations", "org-id-123", "billing", "payment-details"],
{ state: { launchPaymentModalAutomatically: true } },
);
done();
},
service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
title: "Test Organization subscription suspended",
content: { key: "suspendedOwnerOrgMessage" },
type: "danger",
acceptButtonText: "Continue",
cancelButtonText: "Close",
});
expect(router.navigate).toHaveBeenCalledWith(
["organizations", "org-id-123", "billing", "payment-details"],
{ state: { launchPaymentModalAutomatically: true } },
);
done();
});
});
@@ -490,14 +484,12 @@ describe("OrganizationWarningsService", () => {
dialogService.openSimpleDialog.mockResolvedValue(true);
router.navigate.mockResolvedValue(true);
service.showInactiveSubscriptionDialog$(organization).subscribe({
complete: () => {
expect(router.navigate).toHaveBeenCalledWith(
["organizations", "org-id-123", "billing", "payment-details"],
{ state: { launchPaymentModalAutomatically: true } },
);
done();
},
service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
expect(router.navigate).toHaveBeenCalledWith(
["organizations", "org-id-123", "billing", "payment-details"],
{ state: { launchPaymentModalAutomatically: true } },
);
done();
});
});
@@ -509,12 +501,10 @@ describe("OrganizationWarningsService", () => {
dialogService.openSimpleDialog.mockResolvedValue(false);
service.showInactiveSubscriptionDialog$(organization).subscribe({
complete: () => {
expect(dialogService.openSimpleDialog).toHaveBeenCalled();
expect(router.navigate).not.toHaveBeenCalled();
done();
},
service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
expect(dialogService.openSimpleDialog).toHaveBeenCalled();
expect(router.navigate).not.toHaveBeenCalled();
done();
});
});
@@ -534,18 +524,16 @@ describe("OrganizationWarningsService", () => {
(openChangePlanDialog as jest.Mock).mockReturnValue(mockDialogRef);
service.showInactiveSubscriptionDialog$(organization).subscribe({
complete: () => {
expect(organizationApiService.getSubscription).toHaveBeenCalledWith(organization.id);
expect(openChangePlanDialog).toHaveBeenCalledWith(dialogService, {
data: {
organizationId: organization.id,
subscription: subscription,
productTierType: organization.productTierType,
},
});
done();
},
service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
expect(organizationApiService.getSubscription).toHaveBeenCalledWith(organization.id);
expect(openChangePlanDialog).toHaveBeenCalledWith(dialogService, {
data: {
organizationId: organization.id,
subscription: subscription,
productTierType: organization.productTierType,
},
});
done();
});
});
@@ -557,17 +545,15 @@ describe("OrganizationWarningsService", () => {
dialogService.openSimpleDialog.mockResolvedValue(true);
service.showInactiveSubscriptionDialog$(organization).subscribe({
complete: () => {
expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
title: "Test Organization subscription suspended",
content: { key: "suspendedUserOrgMessage" },
type: "danger",
acceptButtonText: "Close",
cancelButtonText: null,
});
done();
},
service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
title: "Test Organization subscription suspended",
content: { key: "suspendedUserOrgMessage" },
type: "danger",
acceptButtonText: "Close",
cancelButtonText: null,
});
done();
});
});
});

17
apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
View File

@@ -46,6 +46,7 @@ export class OrganizationWarningsService {
private refreshFreeTrialWarningTrigger = new Subject<void>();
private refreshTaxIdWarningTrigger = new Subject<void>();
private refreshInactiveSubscriptionWarningTrigger = new Subject<void>();
private taxIdWarningRefreshedSubject = new BehaviorSubject<TaxIdWarningType | null>(null);
taxIdWarningRefreshed$ = this.taxIdWarningRefreshedSubject.asObservable();
@@ -164,12 +165,24 @@ export class OrganizationWarningsService {
refreshFreeTrialWarning = () => this.refreshFreeTrialWarningTrigger.next();
refreshInactiveSubscriptionWarning = () => this.refreshInactiveSubscriptionWarningTrigger.next();
refreshTaxIdWarning = () => this.refreshTaxIdWarningTrigger.next();
showInactiveSubscriptionDialog$ = (organization: Organization): Observable<void> =>
this.getWarning$(organization, (response) => response.inactiveSubscription).pipe(
filter((warning) => warning !== null),
merge(
this.getWarning$(organization, (response) => response.inactiveSubscription),
this.refreshInactiveSubscriptionWarningTrigger.pipe(
switchMap(() =>
this.getWarning$(organization, (response) => response.inactiveSubscription, true),
),
),
).pipe(
switchMap(async (warning) => {
if (!warning) {
return;
}
switch (warning.resolution) {
case "contact_provider": {
await this.dialogService.openSimpleDialog({