Remove circular invocation / have Account menu use new premium dialog (#17980)

apps/desktop/src/app/app.component.ts

@@ -70,6 +70,7 @@ import { SyncService } from "@bitwarden/common/platform/sync";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
@@ -198,6 +199,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private readonly tokenService: TokenService,
     private desktopAutotypeDefaultSettingPolicy: DesktopAutotypeDefaultSettingPolicy,
     private readonly lockService: LockService,
+    private premiumUpgradePromptService: PremiumUpgradePromptService,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
 
@@ -305,7 +307,7 @@ export class AppComponent implements OnInit, OnDestroy {
             await this.openModal<SettingsComponent>(SettingsComponent, this.settingsRef);
             break;
           case "openPremium":
-            this.dialogService.open(PremiumComponent);
+            await this.premiumUpgradePromptService.promptForPremium();
             break;
           case "showFingerprintPhrase": {
             const activeUserId = await firstValueFrom(

apps/desktop/src/app/app.module.ts

@@ -8,6 +8,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 
 import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe";
 import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { CalloutModule, DialogModule } from "@bitwarden/components";
 import { AssignCollectionsComponent } from "@bitwarden/vault";
 
@@ -15,6 +16,7 @@ import { DeleteAccountComponent } from "../auth/delete-account.component";
 import { LoginModule } from "../auth/login/login.module";
 import { SshAgentService } from "../autofill/services/ssh-agent.service";
 import { PremiumComponent } from "../billing/app/accounts/premium.component";
+import { DesktopPremiumUpgradePromptService } from "../services/desktop-premium-upgrade-prompt.service";
 import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module";
 import { VaultV2Component } from "../vault/app/vault/vault-v2.component";
 
@@ -51,7 +53,13 @@ import { SharedModule } from "./shared/shared.module";
     PremiumComponent,
     SearchComponent,
   ],
-  providers: [SshAgentService],
+  providers: [
+    SshAgentService,
+    {
+      provide: PremiumUpgradePromptService,
+      useClass: DesktopPremiumUpgradePromptService,
+    },
+  ],
   bootstrap: [AppComponent],
 })
 export class AppModule {}

apps/desktop/src/services/desktop-premium-upgrade-prompt.service.spec.ts

@@ -4,26 +4,24 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { DialogService } from "@bitwarden/components";
 
+import { PremiumComponent } from "../billing/app/accounts/premium.component";
+
 import { DesktopPremiumUpgradePromptService } from "./desktop-premium-upgrade-prompt.service";
 
 describe("DesktopPremiumUpgradePromptService", () => {
   let service: DesktopPremiumUpgradePromptService;
-  let messager: MockProxy<MessagingService>;
   let configService: MockProxy<ConfigService>;
   let dialogService: MockProxy<DialogService>;
 
   beforeEach(async () => {
-    messager = mock<MessagingService>();
     configService = mock<ConfigService>();
     dialogService = mock<DialogService>();
 
     await TestBed.configureTestingModule({
       providers: [
         DesktopPremiumUpgradePromptService,
-        { provide: MessagingService, useValue: messager },
         { provide: ConfigService, useValue: configService },
         { provide: DialogService, useValue: dialogService },
       ],
@@ -52,10 +50,10 @@ describe("DesktopPremiumUpgradePromptService", () => {
         FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
       );
       expect(openSpy).toHaveBeenCalledWith(dialogService);
-      expect(messager.send).not.toHaveBeenCalled();
+      expect(dialogService.open).not.toHaveBeenCalled();
     });
 
-    it("sends openPremium message when feature flag is disabled", async () => {
+    it("opens the PremiumComponent when feature flag is disabled", async () => {
       configService.getFeatureFlag.mockResolvedValue(false);
 
       await service.promptForPremium();
@@ -63,7 +61,7 @@ describe("DesktopPremiumUpgradePromptService", () => {
       expect(configService.getFeatureFlag).toHaveBeenCalledWith(
         FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
       );
-      expect(messager.send).toHaveBeenCalledWith("openPremium");
+      expect(dialogService.open).toHaveBeenCalledWith(PremiumComponent);
       expect(openSpy).not.toHaveBeenCalled();
     });
   });

apps/desktop/src/services/desktop-premium-upgrade-prompt.service.ts

@@ -3,15 +3,15 @@ import { inject } from "@angular/core";
 import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { DialogService } from "@bitwarden/components";
 
+import { PremiumComponent } from "../billing/app/accounts/premium.component";
+
 /**
  * This class handles the premium upgrade process for the desktop.
  */
 export class DesktopPremiumUpgradePromptService implements PremiumUpgradePromptService {
-  private messagingService = inject(MessagingService);
   private configService = inject(ConfigService);
   private dialogService = inject(DialogService);
 
@@ -23,7 +23,7 @@ export class DesktopPremiumUpgradePromptService implements PremiumUpgradePromptS
     if (showNewDialog) {
       PremiumUpgradeDialogComponent.open(this.dialogService);
     } else {
-      this.messagingService.send("openPremium");
+      this.dialogService.open(PremiumComponent);
     }
   }
 }