Merge branch 'main' into vault/pm-5273

# Conflicts: # libs/common/src/platform/abstractions/state.service.ts # libs/common/src/platform/services/state.service.ts # libs/common/src/state-migrations/migrate.ts
2025-12-20 02:03:39 +00:00 · 2024-03-25 18:38:10 +00:00
parent cf69056e48 4a3e556bbc
commit 8a1df6671a
364 changed files with 9254 additions and 2586 deletions
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -203,6 +203,7 @@ export class LoginCommand {
            ssoCodeVerifier,
            this.ssoRedirectUri,
            orgIdentifier,
+            undefined, // email to look up 2FA token not required as CLI can't remember 2FA token
            twoFactor,
          ),
        );
--- a/apps/cli/src/bw.ts
+++ b/apps/cli/src/bw.ts
@@ -23,10 +23,12 @@ import { PolicyApiService } from "@bitwarden/common/admin-console/services/polic
 import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
 import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AvatarService as AvatarServiceAbstraction } from "@bitwarden/common/auth/abstractions/avatar.service";
 import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
 import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
 import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service";
 import { AuthService } from "@bitwarden/common/auth/services/auth.service";
+import { AvatarService } from "@bitwarden/common/auth/services/avatar.service";
 import { DeviceTrustCryptoService } from "@bitwarden/common/auth/services/device-trust-crypto.service.implementation";
 import { DevicesApiServiceImplementation } from "@bitwarden/common/auth/services/devices-api.service.implementation";
 import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service";
@@ -39,6 +41,8 @@ import {
  DefaultDomainSettingsService,
  DomainSettingsService,
 } from "@bitwarden/common/autofill/services/domain-settings.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
 import { ClientType } from "@bitwarden/common/enums";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction";
 import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service";
@@ -86,7 +90,6 @@ import { AuditService } from "@bitwarden/common/services/audit.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
-import { SettingsService } from "@bitwarden/common/services/settings.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service";
 import {
@@ -155,7 +158,6 @@ export class Main {
  appIdService: AppIdService;
  apiService: NodeApiService;
  environmentService: EnvironmentService;
-  settingsService: SettingsService;
  cipherService: CipherService;
  folderService: InternalFolderService;
  organizationUserService: OrganizationUserService;
@@ -216,8 +218,10 @@ export class Main {
  derivedStateProvider: DerivedStateProvider;
  stateProvider: StateProvider;
  loginStrategyService: LoginStrategyServiceAbstraction;
+  avatarService: AvatarServiceAbstraction;
  stateEventRunnerService: StateEventRunnerService;
  biometricStateService: BiometricStateService;
+  billingAccountProfileStateService: BillingAccountProfileStateService;

  constructor() {
    let p = null;
@@ -291,8 +295,7 @@ export class Main {

    this.activeUserStateProvider = new DefaultActiveUserStateProvider(
      this.accountService,
-      storageServiceProvider,
-      stateEventRegistrarService,
+      this.singleUserStateProvider,
    );

    this.derivedStateProvider = new DefaultDerivedStateProvider(
@@ -308,6 +311,13 @@ export class Main {

    this.environmentService = new EnvironmentService(this.stateProvider, this.accountService);

+    this.tokenService = new TokenService(
+      this.singleUserStateProvider,
+      this.globalStateProvider,
+      this.platformUtilsService.supportsSecureStorage(),
+      this.secureStorageService,
+    );
+
    const migrationRunner = new MigrationRunner(
      this.storageService,
      this.logService,
@@ -322,6 +332,7 @@ export class Main {
      new StateFactory(GlobalState, Account),
      this.accountService,
      this.environmentService,
+      this.tokenService,
      migrationRunner,
    );

@@ -339,7 +350,6 @@ export class Main {
    );

    this.appIdService = new AppIdService(this.globalStateProvider);
-    this.tokenService = new TokenService(this.stateService);

    const customUserAgent =
      "Bitwarden_CLI/" +
@@ -352,6 +362,7 @@ export class Main {
      this.platformUtilsService,
      this.environmentService,
      this.appIdService,
+      this.stateService,
      async (expired: boolean) => await this.logout(),
      customUserAgent,
    );
@@ -362,7 +373,6 @@ export class Main {

    this.containerService = new ContainerService(this.cryptoService, this.encryptService);

-    this.settingsService = new SettingsService(this.stateService);
    this.domainSettingsService = new DefaultDomainSettingsService(this.stateProvider);

    this.fileUploadService = new FileUploadService(this.logService);
@@ -397,7 +407,7 @@ export class Main {

    this.providerService = new ProviderService(this.stateProvider);

-    this.organizationService = new OrganizationService(this.stateService, this.stateProvider);
+    this.organizationService = new OrganizationService(this.stateProvider);

    this.organizationUserService = new OrganizationUserServiceImplementation(this.apiService);

@@ -446,6 +456,10 @@ export class Main {
      this.stateService,
    );

+    this.billingAccountProfileStateService = new DefaultBillingAccountProfileStateService(
+      this.activeUserStateProvider,
+    );
+
    this.loginStrategyService = new LoginStrategyService(
      this.cryptoService,
      this.apiService,
@@ -465,6 +479,7 @@ export class Main {
      this.deviceTrustCryptoService,
      this.authRequestService,
      this.globalStateProvider,
+      this.billingAccountProfileStateService,
    );

    this.authService = new AuthService(
@@ -555,6 +570,8 @@ export class Main {
      null,
    );

+    this.avatarService = new AvatarService(this.apiService, this.stateProvider);
+
    this.syncService = new SyncService(
      this.apiService,
      this.domainSettingsService,
@@ -572,7 +589,9 @@ export class Main {
      this.folderApiService,
      this.organizationService,
      this.sendApiService,
+      this.avatarService,
      async (expired: boolean) => await this.logout(),
+      this.billingAccountProfileStateService,
    );

    this.totpService = new TotpService(this.cryptoFunctionService, this.logService);
@@ -619,15 +638,17 @@ export class Main {

    this.eventUploadService = new EventUploadService(
      this.apiService,
-      this.stateService,
+      this.stateProvider,
      this.logService,
+      this.accountService,
    );

    this.eventCollectionService = new EventCollectionService(
      this.cipherService,
-      this.stateService,
+      this.stateProvider,
      this.organizationService,
      this.eventUploadService,
+      this.accountService,
    );
  }

@@ -651,6 +672,7 @@ export class Main {
    });
    const userId = await this.stateService.getUserId();
    await Promise.all([
+      this.eventUploadService.uploadEvents(userId as UserId),
      this.syncService.setLastSync(new Date(0)),
      this.cryptoService.clearKeys(),
      this.cipherService.clear(userId),
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -1,9 +1,12 @@
+import { firstValueFrom } from "rxjs";
+
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EventType } from "@bitwarden/common/enums";
 import { CardExport } from "@bitwarden/common/models/export/card.export";
 import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
@@ -57,6 +60,7 @@ export class GetCommand extends DownloadCommand {
    private apiService: ApiService,
    private organizationService: OrganizationService,
    private eventCollectionService: EventCollectionService,
+    private accountProfileService: BillingAccountProfileStateService,
  ) {
    super(cryptoService);
  }
@@ -251,7 +255,9 @@ export class GetCommand extends DownloadCommand {
      return Response.error("Couldn't generate TOTP code.");
    }

-    const canAccessPremium = await this.stateService.getCanAccessPremium();
+    const canAccessPremium = await firstValueFrom(
+      this.accountProfileService.hasPremiumFromAnySource$,
+    );
    if (!canAccessPremium) {
      const originalCipher = await this.cipherService.get(cipher.id);
      if (
@@ -334,7 +340,10 @@ export class GetCommand extends DownloadCommand {
      return Response.multipleResults(attachments.map((a) => a.id));
    }

-    if (!(await this.stateService.getCanAccessPremium())) {
+    const canAccessPremium = await firstValueFrom(
+      this.accountProfileService.hasPremiumFromAnySource$,
+    );
+    if (!canAccessPremium) {
      const originalCipher = await this.cipherService.get(cipher.id);
      if (originalCipher == null || originalCipher.organizationId == null) {
        return Response.error("Premium status is required to use this feature.");
--- a/apps/cli/src/commands/serve.command.ts
+++ b/apps/cli/src/commands/serve.command.ts
@@ -68,6 +68,7 @@ export class ServeCommand {
      this.main.apiService,
      this.main.organizationService,
      this.main.eventCollectionService,
+      this.main.billingAccountProfileStateService,
    );
    this.listCommand = new ListCommand(
      this.main.cipherService,
@@ -82,10 +83,10 @@ export class ServeCommand {
    this.createCommand = new CreateCommand(
      this.main.cipherService,
      this.main.folderService,
-      this.main.stateService,
      this.main.cryptoService,
      this.main.apiService,
      this.main.folderApiService,
+      this.main.billingAccountProfileStateService,
    );
    this.editCommand = new EditCommand(
      this.main.cipherService,
@@ -108,9 +109,9 @@ export class ServeCommand {
    this.deleteCommand = new DeleteCommand(
      this.main.cipherService,
      this.main.folderService,
-      this.main.stateService,
      this.main.apiService,
      this.main.folderApiService,
+      this.main.billingAccountProfileStateService,
    );
    this.confirmCommand = new ConfirmCommand(
      this.main.apiService,
@@ -135,9 +136,9 @@ export class ServeCommand {

    this.sendCreateCommand = new SendCreateCommand(
      this.main.sendService,
-      this.main.stateService,
      this.main.environmentService,
      this.main.sendApiService,
+      this.main.billingAccountProfileStateService,
    );
    this.sendDeleteCommand = new SendDeleteCommand(this.main.sendService, this.main.sendApiService);
    this.sendGetCommand = new SendGetCommand(
@@ -148,9 +149,9 @@ export class ServeCommand {
    );
    this.sendEditCommand = new SendEditCommand(
      this.main.sendService,
-      this.main.stateService,
      this.sendGetCommand,
      this.main.sendApiService,
+      this.main.billingAccountProfileStateService,
    );
    this.sendListCommand = new SendListCommand(
      this.main.sendService,
--- a/apps/cli/src/platform/services/node-api.service.ts
+++ b/apps/cli/src/platform/services/node-api.service.ts
@@ -6,6 +6,7 @@ import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { ApiService } from "@bitwarden/common/services/api.service";

 (global as any).fetch = fe.default;
@@ -20,6 +21,7 @@ export class NodeApiService extends ApiService {
    platformUtilsService: PlatformUtilsService,
    environmentService: EnvironmentService,
    appIdService: AppIdService,
+    stateService: StateService,
    logoutCallback: (expired: boolean) => Promise<void>,
    customUserAgent: string = null,
  ) {
@@ -28,6 +30,7 @@ export class NodeApiService extends ApiService {
      platformUtilsService,
      environmentService,
      appIdService,
+      stateService,
      logoutCallback,
      customUserAgent,
    );
--- a/apps/cli/src/tools/generate.command.ts
+++ b/apps/cli/src/tools/generate.command.ts
@@ -1,6 +1,9 @@
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { DefaultPassphraseGenerationOptions } from "@bitwarden/common/tools/generator/passphrase";
-import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
+import {
+  DefaultPasswordGenerationOptions,
+  PasswordGenerationServiceAbstraction,
+} from "@bitwarden/common/tools/generator/password";
 import { PasswordGeneratorOptions } from "@bitwarden/common/tools/generator/password/password-generator-options";

 import { Response } from "../models/response";
@@ -64,7 +67,10 @@ class Options {
    this.capitalize = CliUtils.convertBooleanOption(passedOptions?.capitalize);
    this.includeNumber = CliUtils.convertBooleanOption(passedOptions?.includeNumber);
    this.ambiguous = CliUtils.convertBooleanOption(passedOptions?.ambiguous);
-    this.length = CliUtils.convertNumberOption(passedOptions?.length, 14);
+    this.length = CliUtils.convertNumberOption(
+      passedOptions?.length,
+      DefaultPasswordGenerationOptions.length,
+    );
    this.type = passedOptions?.passphrase ? "passphrase" : "password";
    this.separator = CliUtils.convertStringOption(
      passedOptions?.separator,
@@ -74,8 +80,14 @@ class Options {
      passedOptions?.words,
      DefaultPassphraseGenerationOptions.numWords,
    );
-    this.minNumber = CliUtils.convertNumberOption(passedOptions?.minNumber, 1);
-    this.minSpecial = CliUtils.convertNumberOption(passedOptions?.minSpecial, 1);
+    this.minNumber = CliUtils.convertNumberOption(
+      passedOptions?.minNumber,
+      DefaultPasswordGenerationOptions.minNumber,
+    );
+    this.minSpecial = CliUtils.convertNumberOption(
+      passedOptions?.minSpecial,
+      DefaultPasswordGenerationOptions.minSpecial,
+    );

    if (!this.uppercase && !this.lowercase && !this.special && !this.number) {
      this.lowercase = true;
--- a/apps/cli/src/tools/send/commands/create.command.ts
+++ b/apps/cli/src/tools/send/commands/create.command.ts
@@ -1,8 +1,10 @@
 import * as fs from "fs";
 import * as path from "path";

+import { firstValueFrom } from "rxjs";
+
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
@@ -16,9 +18,9 @@ import { SendResponse } from "../models/send.response";
 export class SendCreateCommand {
  constructor(
    private sendService: SendService,
-    private stateService: StateService,
    private environmentService: EnvironmentService,
    private sendApiService: SendApiService,
+    private accountProfileService: BillingAccountProfileStateService,
  ) {}

  async run(requestJson: any, cmdOptions: Record<string, any>) {
@@ -82,7 +84,7 @@ export class SendCreateCommand {
          );
        }

-        if (!(await this.stateService.getCanAccessPremium())) {
+        if (!(await firstValueFrom(this.accountProfileService.hasPremiumFromAnySource$))) {
          return Response.error("Premium status is required to use this feature.");
        }

--- a/apps/cli/src/tools/send/commands/edit.command.ts
+++ b/apps/cli/src/tools/send/commands/edit.command.ts
@@ -1,4 +1,6 @@
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { firstValueFrom } from "rxjs";
+
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
@@ -12,9 +14,9 @@ import { SendGetCommand } from "./get.command";
 export class SendEditCommand {
  constructor(
    private sendService: SendService,
-    private stateService: StateService,
    private getCommand: SendGetCommand,
    private sendApiService: SendApiService,
+    private accountProfileService: BillingAccountProfileStateService,
  ) {}

  async run(requestJson: string, cmdOptions: Record<string, any>): Promise<Response> {
@@ -57,7 +59,10 @@ export class SendEditCommand {
      return Response.badRequest("Cannot change a Send's type");
    }

-    if (send.type === SendType.File && !(await this.stateService.getCanAccessPremium())) {
+    const canAccessPremium = await firstValueFrom(
+      this.accountProfileService.hasPremiumFromAnySource$,
+    );
+    if (send.type === SendType.File && !canAccessPremium) {
      return Response.error("Premium status is required to use this feature.");
    }

--- a/apps/cli/src/tools/send/send.program.ts
+++ b/apps/cli/src/tools/send/send.program.ts
@@ -153,6 +153,7 @@ export class SendProgram extends Program {
          this.main.apiService,
          this.main.organizationService,
          this.main.eventCollectionService,
+          this.main.billingAccountProfileStateService,
        );
        const response = await cmd.run("template", object, null);
        this.processResponse(response);
@@ -253,9 +254,9 @@ export class SendProgram extends Program {
        );
        const cmd = new SendEditCommand(
          this.main.sendService,
-          this.main.stateService,
          getCmd,
          this.main.sendApiService,
+          this.main.billingAccountProfileStateService,
        );
        const response = await cmd.run(encodedJson, options);
        this.processResponse(response);
@@ -323,9 +324,9 @@ export class SendProgram extends Program {
    await this.exitIfLocked();
    const cmd = new SendCreateCommand(
      this.main.sendService,
-      this.main.stateService,
      this.main.environmentService,
      this.main.sendApiService,
+      this.main.billingAccountProfileStateService,
    );
    return await cmd.run(encodedJson, options);
  }
--- a/apps/cli/src/vault.program.ts
+++ b/apps/cli/src/vault.program.ts
@@ -188,6 +188,7 @@ export class VaultProgram extends Program {
          this.main.apiService,
          this.main.organizationService,
          this.main.eventCollectionService,
+          this.main.billingAccountProfileStateService,
        );
        const response = await command.run(object, id, cmd);
        this.processResponse(response);
@@ -226,10 +227,10 @@ export class VaultProgram extends Program {
        const command = new CreateCommand(
          this.main.cipherService,
          this.main.folderService,
-          this.main.stateService,
          this.main.cryptoService,
          this.main.apiService,
          this.main.folderApiService,
+          this.main.billingAccountProfileStateService,
        );
        const response = await command.run(object, encodedJson, cmd);
        this.processResponse(response);
@@ -313,9 +314,9 @@ export class VaultProgram extends Program {
        const command = new DeleteCommand(
          this.main.cipherService,
          this.main.folderService,
-          this.main.stateService,
          this.main.apiService,
          this.main.folderApiService,
+          this.main.billingAccountProfileStateService,
        );
        const response = await command.run(object, id, cmd);
        this.processResponse(response);
--- a/apps/cli/src/vault/create.command.ts
+++ b/apps/cli/src/vault/create.command.ts
@@ -1,13 +1,15 @@
 import * as fs from "fs";
 import * as path from "path";

+import { firstValueFrom } from "rxjs";
+
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
 import { CollectionExport } from "@bitwarden/common/models/export/collection.export";
 import { FolderExport } from "@bitwarden/common/models/export/folder.export";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
@@ -26,10 +28,10 @@ export class CreateCommand {
  constructor(
    private cipherService: CipherService,
    private folderService: FolderService,
-    private stateService: StateService,
    private cryptoService: CryptoService,
    private apiService: ApiService,
    private folderApiService: FolderApiServiceAbstraction,
+    private accountProfileService: BillingAccountProfileStateService,
  ) {}

  async run(
@@ -124,7 +126,10 @@ export class CreateCommand {
      return Response.notFound();
    }

-    if (cipher.organizationId == null && !(await this.stateService.getCanAccessPremium())) {
+    if (
+      cipher.organizationId == null &&
+      !(await firstValueFrom(this.accountProfileService.hasPremiumFromAnySource$))
+    ) {
      return Response.error("Premium status is required to use this feature.");
    }

--- a/apps/cli/src/vault/delete.command.ts
+++ b/apps/cli/src/vault/delete.command.ts
@@ -1,5 +1,7 @@
+import { firstValueFrom } from "rxjs";
+
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
@@ -12,9 +14,9 @@ export class DeleteCommand {
  constructor(
    private cipherService: CipherService,
    private folderService: FolderService,
-    private stateService: StateService,
    private apiService: ApiService,
    private folderApiService: FolderApiServiceAbstraction,
+    private accountProfileService: BillingAccountProfileStateService,
  ) {}

  async run(object: string, id: string, cmdOptions: Record<string, any>): Promise<Response> {
@@ -75,7 +77,10 @@ export class DeleteCommand {
      return Response.error("Attachment `" + id + "` was not found.");
    }

-    if (cipher.organizationId == null && !(await this.stateService.getCanAccessPremium())) {
+    const canAccessPremium = await firstValueFrom(
+      this.accountProfileService.hasPremiumFromAnySource$,
+    );
+    if (cipher.organizationId == null && !canAccessPremium) {
      return Response.error("Premium status is required to use this feature.");
    }