[PM-14366] Deprecated active user state from billing state service (#…

…12273) * Updated billing state provider to not rely on ActiveUserStateProvider * Updated usages * Resolved browser build * Resolved web build * Resolved CLI build * resolved desktop build * Update apps/cli/src/tools/send/commands/create.command.ts Co-authored-by: ✨ Audrey ✨ <ajensen@bitwarden.com> * Move subscription visibility logic from component to service * Resolved unit test failures. Using existing userIds where present * Simplified activeUserId access * Resolved typescript strict errors * Resolved broken unit test * Resolved ts strict error --------- Co-authored-by: ✨ Audrey ✨ <ajensen@bitwarden.com>
bitwarden · Jan 7, 2025 · 91d6963 · 91d6963
1 parent 003f5fd
commit 91d6963
Show file tree

Hide file tree

Showing 56 changed files with 595 additions and 227 deletions.
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
@@ -1,12 +1,14 @@
 import { mock, MockProxy } from "jest-mock-extended";
 import { of } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { NOOP_COMMAND_SUFFIX } from "@bitwarden/common/autofill/constants";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { UserId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -19,6 +21,7 @@ describe("context-menu", () => {
   let i18nService: MockProxy<I18nService>;
   let logService: MockProxy<LogService>;
   let billingAccountProfileStateService: MockProxy<BillingAccountProfileStateService>;
+  let accountService: MockProxy<AccountService>;
 
   let removeAllSpy: jest.SpyInstance<void, [callback?: () => void]>;
   let createSpy: jest.SpyInstance<
@@ -34,6 +37,7 @@ describe("context-menu", () => {
     i18nService = mock();
     logService = mock();
     billingAccountProfileStateService = mock();
+    accountService = mock();
 
     removeAllSpy = jest
       .spyOn(chrome.contextMenus, "removeAll")
@@ -53,8 +57,15 @@ describe("context-menu", () => {
       i18nService,
       logService,
       billingAccountProfileStateService,
+      accountService,
     );
     autofillSettingsService.enableContextMenu$ = of(true);
+    accountService.activeAccount$ = of({
+      id: "userId" as UserId,
+      email: "",
+      emailVerified: false,
+      name: undefined,
+    });
   });
 
   afterEach(() => jest.resetAllMocks());
@@ -69,15 +80,15 @@ describe("context-menu", () => {
     });
 
     it("has menu enabled, but does not have premium", async () => {
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(false);
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
 
       const createdMenu = await sut.init();
       expect(createdMenu).toBeTruthy();
       expect(createSpy).toHaveBeenCalledTimes(10);
     });
 
     it("has menu enabled and has premium", async () => {
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(true);
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(true));
 
       const createdMenu = await sut.init();
       expect(createdMenu).toBeTruthy();
@@ -131,16 +142,15 @@ describe("context-menu", () => {
     });
 
     it("create entry for each cipher piece", async () => {
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(true);
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(true));
 
       await sut.loadOptions("TEST_TITLE", "1", createCipher());
 
-      // One for autofill, copy username, copy password, and copy totp code
       expect(createSpy).toHaveBeenCalledTimes(4);
     });
 
     it("creates a login/unlock item for each context menu action option when user is not authenticated", async () => {
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(true);
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(true));
 
       await sut.loadOptions("TEST_TITLE", "NOOP");
 

diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -2,6 +2,7 @@
 // @ts-strict-ignore
 import { firstValueFrom } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import {
   AUTOFILL_CARD_ID,
   AUTOFILL_ID,
@@ -149,6 +150,7 @@ export class MainContextMenuHandler {
     private i18nService: I18nService,
     private logService: LogService,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private accountService: AccountService,
   ) {}
 
   /**
@@ -168,11 +170,13 @@ export class MainContextMenuHandler {
     this.initRunning = true;
 
     try {
+      const account = await firstValueFrom(this.accountService.activeAccount$);
+      const hasPremium = await firstValueFrom(
+        this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
+      );
+
       for (const options of this.initContextMenuItems) {
-        if (
-          options.checkPremiumAccess &&
-          !(await firstValueFrom(this.billingAccountProfileStateService.hasPremiumFromAnySource$))
-        ) {
+        if (options.checkPremiumAccess && !hasPremium) {
           continue;
         }
 
@@ -267,8 +271,9 @@ export class MainContextMenuHandler {
         await createChildItem(COPY_USERNAME_ID);
       }
 
+      const account = await firstValueFrom(this.accountService.activeAccount$);
       const canAccessPremium = await firstValueFrom(
-        this.billingAccountProfileStateService.hasPremiumFromAnySource$,
+        this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
       );
       if (canAccessPremium && (!cipher || !Utils.isNullOrEmpty(cipher.login?.totp))) {
         await createChildItem(COPY_VERIFICATION_CODE_ID);

diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -1,4 +1,4 @@
-import { mock, mockReset, MockProxy } from "jest-mock-extended";
+import { mock, MockProxy, mockReset } from "jest-mock-extended";
 import { BehaviorSubject, of, Subject } from "rxjs";
 
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -730,7 +730,9 @@ describe("AutofillService", () => {
 
       it("throws an error if an autofill did not occur for any of the passed pages", async () => {
         autofillOptions.tab.url = "https://a-different-url.com";
-        billingAccountProfileStateService.hasPremiumFromAnySource$ = of(true);
+        jest
+          .spyOn(billingAccountProfileStateService, "hasPremiumFromAnySource$")
+          .mockImplementation(() => of(true));
 
         try {
           await autofillService.doAutoFill(autofillOptions);
@@ -912,7 +914,9 @@ describe("AutofillService", () => {
     it("returns a TOTP value", async () => {
       const totpCode = "123456";
       autofillOptions.cipher.login.totp = "totp";
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(true);
+      jest
+        .spyOn(billingAccountProfileStateService, "hasPremiumFromAnySource$")
+        .mockImplementation(() => of(true));
       jest.spyOn(autofillService, "getShouldAutoCopyTotp").mockResolvedValue(true);
       jest.spyOn(totpService, "getCode").mockResolvedValue(totpCode);
 
@@ -925,7 +929,9 @@ describe("AutofillService", () => {
 
     it("does not return a TOTP value if the user does not have premium features", async () => {
       autofillOptions.cipher.login.totp = "totp";
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(false);
+      jest
+        .spyOn(billingAccountProfileStateService, "hasPremiumFromAnySource$")
+        .mockImplementation(() => of(false));
       jest.spyOn(autofillService, "getShouldAutoCopyTotp").mockResolvedValue(true);
 
       const autofillResult = await autofillService.doAutoFill(autofillOptions);
@@ -959,7 +965,9 @@ describe("AutofillService", () => {
     it("returns a null value if the user cannot access premium and the organization does not use TOTP", async () => {
       autofillOptions.cipher.login.totp = "totp";
       autofillOptions.cipher.organizationUseTotp = false;
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(false);
+      jest
+        .spyOn(billingAccountProfileStateService, "hasPremiumFromAnySource$")
+        .mockImplementation(() => of(false));
 
       const autofillResult = await autofillService.doAutoFill(autofillOptions);
 
@@ -969,7 +977,9 @@ describe("AutofillService", () => {
     it("returns a null value if the user has disabled `auto TOTP copy`", async () => {
       autofillOptions.cipher.login.totp = "totp";
       autofillOptions.cipher.organizationUseTotp = true;
-      billingAccountProfileStateService.hasPremiumFromAnySource$ = of(true);
+      jest
+        .spyOn(billingAccountProfileStateService, "hasPremiumFromAnySource$")
+        .mockImplementation(() => of(true));
       jest.spyOn(autofillService, "getShouldAutoCopyTotp").mockResolvedValue(false);
       jest.spyOn(totpService, "getCode");
 

diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
@@ -416,8 +416,9 @@ export default class AutofillService implements AutofillServiceInterface {
 
     let totp: string | null = null;
 
+    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
     const canAccessPremium = await firstValueFrom(
-      this.billingAccountProfileStateService.hasPremiumFromAnySource$,
+      this.billingAccountProfileStateService.hasPremiumFromAnySource$(activeAccount.id),
     );
     const defaultUriMatch = await this.getDefaultUriMatchStrategy();
 

diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
@@ -792,6 +792,8 @@ export default class MainBackground {
 
     this.billingAccountProfileStateService = new DefaultBillingAccountProfileStateService(
       this.stateProvider,
+      this.platformUtilsService,
+      this.apiService,
     );
 
     this.ssoLoginService = new SsoLoginService(this.stateProvider);
@@ -1229,6 +1231,7 @@ export default class MainBackground {
       this.i18nService,
       this.logService,
       this.billingAccountProfileStateService,
+      this.accountService,
     );
 
     this.cipherContextMenuHandler = new CipherContextMenuHandler(

diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
@@ -202,8 +202,11 @@ export default class RuntimeBackground {
         return await this.configService.getFeatureFlag(FeatureFlag.InlineMenuFieldQualification);
       }
       case "getUserPremiumStatus": {
+        const activeUserId = await firstValueFrom(
+          this.accountService.activeAccount$.pipe(map((a) => a?.id)),
+        );
         const result = await firstValueFrom(
-          this.billingAccountProfileStateService.hasPremiumFromAnySource$,
+          this.billingAccountProfileStateService.hasPremiumFromAnySource$(activeUserId),
         );
         return result;
       }

diff --git a/apps/browser/src/billing/popup/settings/premium-v2.component.ts b/apps/browser/src/billing/popup/settings/premium-v2.component.ts
@@ -7,6 +7,7 @@ import { RouterModule } from "@angular/router";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/vault/components/premium.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -56,6 +57,7 @@ export class PremiumV2Component extends BasePremiumComponent {
     dialogService: DialogService,
     environmentService: EnvironmentService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
+    accountService: AccountService,
   ) {
     super(
       i18nService,
@@ -66,6 +68,7 @@ export class PremiumV2Component extends BasePremiumComponent {
       dialogService,
       environmentService,
       billingAccountProfileStateService,
+      accountService,
     );
 
     // Support old price string. Can be removed in future once all translations are properly updated.

diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts b/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts
@@ -91,7 +91,17 @@ describe("SendV2Component", () => {
         CurrentAccountComponent,
       ],
       providers: [
-        { provide: AccountService, useValue: mock<AccountService>() },
+        {
+          provide: AccountService,
+          useValue: {
+            activeAccount$: of({
+              id: "123",
+              email: "test@email.com",
+              emailVerified: true,
+              name: "Test User",
+            }),
+          },
+        },
         { provide: AuthService, useValue: mock<AuthService>() },
         { provide: AvatarService, useValue: mock<AvatarService>() },
         {

diff --git a/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts b/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts
@@ -1,10 +1,11 @@
 import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { RouterModule } from "@angular/router";
-import { Observable, firstValueFrom } from "rxjs";
+import { Observable, firstValueFrom, of, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { DialogService, ItemModule } from "@bitwarden/components";
@@ -36,12 +37,19 @@ export class MoreFromBitwardenPageV2Component {
 
   constructor(
     private dialogService: DialogService,
-    billingAccountProfileStateService: BillingAccountProfileStateService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
     private environmentService: EnvironmentService,
     private organizationService: OrganizationService,
     private familiesPolicyService: FamiliesPolicyService,
+    private accountService: AccountService,
   ) {
-    this.canAccessPremium$ = billingAccountProfileStateService.hasPremiumFromAnySource$;
+    this.canAccessPremium$ = this.accountService.activeAccount$.pipe(
+      switchMap((account) =>
+        account
+          ? this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id)
+          : of(false),
+      ),
+    );
     this.familySponsorshipAvailable$ = this.organizationService.familySponsorshipAvailable$;
     this.hasSingleEnterpriseOrg$ = this.familiesPolicyService.hasSingleEnterpriseOrg$();
     this.isFreeFamilyPolicyEnabled$ = this.familiesPolicyService.isFreeFamilyPolicyEnabled$();

diff --git a/...popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts b/...popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { Router } from "@angular/router";
 import { RouterTestingModule } from "@angular/router/testing";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, of } from "rxjs";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -10,7 +10,6 @@ import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abs
 import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { CipherId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -55,14 +54,22 @@ describe("OpenAttachmentsComponent", () => {
   const showFilePopoutMessage = jest.fn().mockReturnValue(false);
 
   const mockUserId = Utils.newGuid() as UserId;
-  const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
+  const accountService = {
+    activeAccount$: of({
+      id: mockUserId,
+      email: "test@email.com",
+      emailVerified: true,
+      name: "Test User",
+    }),
+  };
 
   beforeEach(async () => {
     openCurrentPagePopout.mockClear();
     getCipher.mockClear();
     showToast.mockClear();
     getOrganization.mockClear();
     showFilePopoutMessage.mockClear();
+    hasPremiumFromAnySource$.next(true);
 
     await TestBed.configureTestingModule({
       imports: [OpenAttachmentsComponent, RouterTestingModule],
@@ -96,7 +103,7 @@ describe("OpenAttachmentsComponent", () => {
     }).compileComponents();
   });
 
-  beforeEach(() => {
+  beforeEach(async () => {
     fixture = TestBed.createComponent(OpenAttachmentsComponent);
     component = fixture.componentInstance;
     component.cipherId = "5555-444-3333" as CipherId;
@@ -107,7 +114,7 @@ describe("OpenAttachmentsComponent", () => {
 
   it("opens attachments in new popout", async () => {
     showFilePopoutMessage.mockReturnValue(true);
-
+    component.canAccessAttachments = true;
     await component.ngOnInit();
 
     await component.openAttachments();
@@ -120,7 +127,7 @@ describe("OpenAttachmentsComponent", () => {
 
   it("opens attachments in same window", async () => {
     showFilePopoutMessage.mockReturnValue(false);
-
+    component.canAccessAttachments = true;
     await component.ngOnInit();
 
     await component.openAttachments();