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

* Refresh inactive subscription warning after restarting subscription

* Fix tests

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

@@ -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() {

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

@@ -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({
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
-        complete: () => {
         expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
         done();
-        },
       });
     });
 
@@ -437,8 +435,7 @@ describe("OrganizationWarningsService", () => {
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
-        complete: () => {
         expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
           title: "Test Organization subscription suspended",
           content: {
@@ -450,7 +447,6 @@ describe("OrganizationWarningsService", () => {
           cancelButtonText: null,
         });
         done();
-        },
       });
     });
 
@@ -463,8 +459,7 @@ describe("OrganizationWarningsService", () => {
       dialogService.openSimpleDialog.mockResolvedValue(true);
       router.navigate.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
-        complete: () => {
         expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
           title: "Test Organization subscription suspended",
           content: { key: "suspendedOwnerOrgMessage" },
@@ -477,7 +472,6 @@ describe("OrganizationWarningsService", () => {
           { state: { launchPaymentModalAutomatically: true } },
         );
         done();
-        },
       });
     });
 
@@ -490,14 +484,12 @@ describe("OrganizationWarningsService", () => {
       dialogService.openSimpleDialog.mockResolvedValue(true);
       router.navigate.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
-        complete: () => {
         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({
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
-        complete: () => {
         expect(dialogService.openSimpleDialog).toHaveBeenCalled();
         expect(router.navigate).not.toHaveBeenCalled();
         done();
-        },
       });
     });
 
@@ -534,8 +524,7 @@ describe("OrganizationWarningsService", () => {
 
       (openChangePlanDialog as jest.Mock).mockReturnValue(mockDialogRef);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
-        complete: () => {
         expect(organizationApiService.getSubscription).toHaveBeenCalledWith(organization.id);
         expect(openChangePlanDialog).toHaveBeenCalledWith(dialogService, {
           data: {
@@ -545,7 +534,6 @@ describe("OrganizationWarningsService", () => {
           },
         });
         done();
-        },
       });
     });
 
@@ -557,8 +545,7 @@ describe("OrganizationWarningsService", () => {
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
-        complete: () => {
         expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
           title: "Test Organization subscription suspended",
           content: { key: "suspendedUserOrgMessage" },
@@ -567,7 +554,6 @@ describe("OrganizationWarningsService", () => {
           cancelButtonText: null,
         });
         done();
-        },
       });
     });
   });

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

@@ -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(
+    merge(
-      filter((warning) => warning !== null),
+      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({