[SG-1016] Move MP confirmation to modal for encryptions settings changes (#4762)

* work: moving the form * fix: lint do be crazy sometimes * fix: remove debug stuff * fix: dialogService * per Danielle Flinn: option 1, leave sizing wide. * work: move modules to own container * work: reorg modules --------- Co-authored-by: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
2025-12-19 09:43:23 +00:00 · 2023-03-09 23:54:11 -05:00
parent e90372cb5e
commit 0c84fcbcef
7 changed files with 170 additions and 70 deletions
--- a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts
+++ b/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts
@@ -0,0 +1,92 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { Component, Inject } from "@angular/core";
+import { FormGroup, FormControl, Validators } from "@angular/forms";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
+import { KdfType } from "@bitwarden/common/enums/kdfType";
+import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
+
+@Component({
+  selector: "app-change-kdf-confirmation",
+  templateUrl: "change-kdf-confirmation.component.html",
+})
+export class ChangeKdfConfirmationComponent {
+  kdf: KdfType;
+  kdfConfig: KdfConfig;
+
+  form = new FormGroup({
+    masterPassword: new FormControl(null, Validators.required),
+  });
+  showPassword = false;
+  masterPassword: string;
+  formPromise: Promise<any>;
+  loading = false;
+
+  constructor(
+    private apiService: ApiService,
+    private i18nService: I18nService,
+    private platformUtilsService: PlatformUtilsService,
+    private cryptoService: CryptoService,
+    private messagingService: MessagingService,
+    private stateService: StateService,
+    private logService: LogService,
+    @Inject(DIALOG_DATA) params: { kdf: KdfType; kdfConfig: KdfConfig }
+  ) {
+    this.kdf = params.kdf;
+    this.kdfConfig = params.kdfConfig;
+    this.masterPassword = null;
+  }
+
+  async submit() {
+    this.loading = true;
+    const hasEncKey = await this.cryptoService.hasEncKey();
+    if (!hasEncKey) {
+      this.platformUtilsService.showToast("error", null, this.i18nService.t("updateKey"));
+      return;
+    }
+
+    try {
+      this.formPromise = this.makeKeyAndSaveAsync();
+      await this.formPromise;
+      this.platformUtilsService.showToast(
+        "success",
+        this.i18nService.t("encKeySettingsChanged"),
+        this.i18nService.t("logBackIn")
+      );
+      this.messagingService.send("logout");
+    } catch (e) {
+      this.logService.error(e);
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  private async makeKeyAndSaveAsync() {
+    const masterPassword = this.form.value.masterPassword;
+    const request = new KdfRequest();
+    request.kdf = this.kdf;
+    request.kdfIterations = this.kdfConfig.iterations;
+    request.kdfMemory = this.kdfConfig.memory;
+    request.kdfParallelism = this.kdfConfig.parallelism;
+    request.masterPasswordHash = await this.cryptoService.hashPassword(masterPassword, null);
+    const email = await this.stateService.getEmail();
+    const newKey = await this.cryptoService.makeKey(
+      masterPassword,
+      email,
+      this.kdf,
+      this.kdfConfig
+    );
+    request.newMasterPasswordHash = await this.cryptoService.hashPassword(masterPassword, newKey);
+    const newEncKey = await this.cryptoService.remakeEncKey(newKey);
+    request.key = newEncKey[1].encryptedString;
+
+    await this.apiService.postAccountKdf(request);
+  }
+}