Merge branch 'main' into ps/PM-7846-rust-ipc

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

@@ -19,6 +19,7 @@ import {
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
+import { twofactorRefactorSwap } from "../../../../libs/angular/src/utils/two-factor-component-refactor-route-swap";
 import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component";
 import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard";
 import { HintComponent } from "../auth/hint.component";
@@ -30,6 +31,7 @@ import { RegisterComponent } from "../auth/register.component";
 import { RemovePasswordComponent } from "../auth/remove-password.component";
 import { SetPasswordComponent } from "../auth/set-password.component";
 import { SsoComponent } from "../auth/sso.component";
+import { TwoFactorAuthComponent } from "../auth/two-factor-auth.component";
 import { TwoFactorComponent } from "../auth/two-factor.component";
 import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { VaultComponent } from "../vault/app/vault/vault.component";
@@ -61,7 +63,24 @@ const routes: Routes = [
     path: "admin-approval-requested",
     component: LoginViaAuthRequestComponent,
   },
-  { path: "2fa", component: TwoFactorComponent },
+  ...twofactorRefactorSwap(
+    TwoFactorComponent,
+    AnonLayoutWrapperComponent,
+    {
+      path: "2fa",
+    },
+    {
+      path: "2fa",
+      component: AnonLayoutWrapperComponent,
+      children: [
+        {
+          path: "",
+          component: TwoFactorAuthComponent,
+          canActivate: [unauthGuardFn()],
+        },
+      ],
+    },
+  ),
   {
     path: "login-initiated",
     component: LoginDecryptionOptionsComponent,

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

@@ -403,7 +403,6 @@ export class AppComponent implements OnInit, OnDestroy {
             // Clear sequentialized caches
             clearCaches();
             if (message.userId != null) {
-              await this.stateService.clearDecryptedData(message.userId);
               await this.accountService.switchAccount(message.userId);
             }
             const locked =

apps/desktop/src/app/layout/account-switcher.component.ts

@@ -165,8 +165,6 @@ export class AccountSwitcherComponent {
   async addAccount() {
     this.close();
 
-    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
-    await this.stateService.clearDecryptedData(activeAccount?.id as UserId);
     await this.accountService.switchAccount(null);
     await this.router.navigate(["/login"]);
   }

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

@@ -13,7 +13,6 @@ import {
   SUPPORTS_SECURE_STORAGE,
   SYSTEM_THEME_OBSERVABLE,
   SafeInjectionToken,
-  STATE_FACTORY,
   DEFAULT_VAULT_TIMEOUT,
   INTRAPROCESS_MESSAGING_SUBJECT,
   CLIENT_TYPE,
@@ -25,13 +24,11 @@ import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/a
 import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
 import { KdfConfigService as KdfConfigServiceAbstraction } from "@bitwarden/common/auth/abstractions/kdf-config.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { ClientType } from "@bitwarden/common/enums";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service";
@@ -45,13 +42,10 @@ import { StateService as StateServiceAbstraction } from "@bitwarden/common/platf
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency injection
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
-import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
 import { SystemService } from "@bitwarden/common/platform/services/system.service";
 import { GlobalStateProvider, StateProvider } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- Implementation for memory storage
@@ -63,7 +57,6 @@ import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legac
 
 import { PinServiceAbstraction } from "../../../../../libs/auth/src/common/abstractions";
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
-import { Account } from "../../models/account";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
 import { ElectronCryptoService } from "../../platform/services/electron-crypto.service";
 import { ElectronLogRendererService } from "../../platform/services/electron-log.renderer.service";
@@ -74,7 +67,6 @@ import {
 import { ElectronRendererMessageSender } from "../../platform/services/electron-renderer-message.sender";
 import { ElectronRendererSecureStorageService } from "../../platform/services/electron-renderer-secure-storage.service";
 import { ElectronRendererStorageService } from "../../platform/services/electron-renderer-storage.service";
-import { ElectronStateService } from "../../platform/services/electron-state.service";
 import { I18nRendererService } from "../../platform/services/i18n.renderer.service";
 import { fromIpcMessaging } from "../../platform/utils/from-ipc-messaging";
 import { fromIpcSystemTheme } from "../../platform/utils/from-ipc-system-theme";
@@ -90,11 +82,6 @@ import { RendererCryptoFunctionService } from "./renderer-crypto-function.servic
 
 const RELOAD_CALLBACK = new SafeInjectionToken<() => any>("RELOAD_CALLBACK");
 
-// Desktop has its own Account definition which must be used in its StateService
-const DESKTOP_STATE_FACTORY = new SafeInjectionToken<StateFactory<GlobalState, Account>>(
-  "DESKTOP_STATE_FACTORY",
-);
-
 /**
  * Provider definitions used in the ngModule.
  * Add your provider definition here using the safeProvider function as a wrapper. This will give you type safety.
@@ -111,14 +98,6 @@ const safeProviders: SafeProvider[] = [
     deps: [InitService],
     multi: true,
   }),
-  safeProvider({
-    provide: DESKTOP_STATE_FACTORY,
-    useValue: new StateFactory(GlobalState, Account),
-  }),
-  safeProvider({
-    provide: STATE_FACTORY,
-    useValue: null,
-  }),
   safeProvider({
     provide: RELOAD_CALLBACK,
     useValue: null,
@@ -194,28 +173,12 @@ const safeProviders: SafeProvider[] = [
       MessagingServiceAbstraction,
       PlatformUtilsServiceAbstraction,
       RELOAD_CALLBACK,
-      StateServiceAbstraction,
       AutofillSettingsServiceAbstraction,
       VaultTimeoutSettingsService,
       BiometricStateService,
       AccountServiceAbstraction,
     ],
   }),
-  safeProvider({
-    provide: StateServiceAbstraction,
-    useClass: ElectronStateService,
-    deps: [
-      AbstractStorageService,
-      SECURE_STORAGE,
-      MEMORY_STORAGE,
-      LogService,
-      DESKTOP_STATE_FACTORY,
-      AccountServiceAbstraction,
-      EnvironmentService,
-      TokenService,
-      MigrationRunner,
-    ],
-  }),
   safeProvider({
     provide: FileDownloadService,
     useClass: DesktopFileDownloadService,

apps/desktop/src/auth/two-factor-auth.component.ts

@@ -0,0 +1,41 @@
+import { DialogModule } from "@angular/cdk/dialog";
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+import { ReactiveFormsModule } from "@angular/forms";
+import { RouterLink } from "@angular/router";
+
+import { TwoFactorAuthAuthenticatorComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth-authenticator.component";
+import { TwoFactorAuthComponent as BaseTwoFactorAuthComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component";
+import { TwoFactorOptionsComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-options.component";
+import { JslibModule } from "../../../../libs/angular/src/jslib.module";
+import { AsyncActionsModule } from "../../../../libs/components/src/async-actions";
+import { ButtonModule } from "../../../../libs/components/src/button";
+import { CheckboxModule } from "../../../../libs/components/src/checkbox";
+import { FormFieldModule } from "../../../../libs/components/src/form-field";
+import { LinkModule } from "../../../../libs/components/src/link";
+import { I18nPipe } from "../../../../libs/components/src/shared/i18n.pipe";
+import { TypographyModule } from "../../../../libs/components/src/typography";
+
+@Component({
+  standalone: true,
+  templateUrl:
+    "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component.html",
+  selector: "app-two-factor-auth",
+  imports: [
+    CommonModule,
+    JslibModule,
+    DialogModule,
+    ButtonModule,
+    LinkModule,
+    TypographyModule,
+    ReactiveFormsModule,
+    FormFieldModule,
+    AsyncActionsModule,
+    RouterLink,
+    CheckboxModule,
+    TwoFactorOptionsComponent,
+    TwoFactorAuthAuthenticatorComponent,
+  ],
+  providers: [I18nPipe],
+})
+export class TwoFactorAuthComponent extends BaseTwoFactorAuthComponent {}

apps/desktop/src/models/account.ts

@@ -1,20 +0,0 @@
-import {
-  Account as BaseAccount,
-  AccountSettings as BaseAccountSettings,
-} from "@bitwarden/common/platform/models/domain/account";
-
-export class AccountSettings extends BaseAccountSettings {
-  dismissedBiometricRequirePasswordOnStartCallout?: boolean;
-}
-
-export class Account extends BaseAccount {
-  settings?: AccountSettings = new AccountSettings();
-
-  constructor(init: Partial<Account>) {
-    super(init);
-    Object.assign(this.settings, {
-      ...new AccountSettings(),
-      ...this.settings,
-    });
-  }
-}

apps/desktop/src/platform/services/electron-state.service.ts

@@ -1,12 +0,0 @@
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
-import { StateService as BaseStateService } from "@bitwarden/common/platform/services/state.service";
-
-import { Account } from "../../models/account";
-
-export class ElectronStateService extends BaseStateService<GlobalState, Account> {
-  async addAccount(account: Account) {
-    // Apply desktop overides to default account values
-    account = new Account(account);
-    await super.addAccount(account);
-  }
-}