Suggested changes from CR

libs/angular/src/components/user-secret-prompt.component.ts

@@ -1,60 +0,0 @@
-import { Directive } from "@angular/core";
-import { FormBuilder, FormControl } from "@angular/forms";
-
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportService } from "@bitwarden/common/abstractions/import.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service";
-
-import { ModalConfig } from "../services/modal.service";
-
-import { ModalRef } from "./modal/modal.ref";
-
-/**
- * Used to verify the user's secret, you can customize all of the text in the modal.
- */
-@Directive()
-export class UserSecretPromptComponent {
-  showPassword = false;
-  organizationId = "";
-  confirmDescription = "";
-  confirmButtonText = "";
-  modalTitle = "";
-
-  myGroup = this.formBuilder.group({
-    secret: new FormControl(),
-  });
-
-  constructor(
-    private modalRef: ModalRef,
-    private cryptoService: CryptoService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-    private importService: ImportService,
-    protected config: ModalConfig,
-    protected userVerificationService: UserVerificationService,
-    private formBuilder: FormBuilder
-  ) {
-    this.confirmDescription = config.data.confirmDescription;
-    this.confirmButtonText = config.data.confirmButtonText;
-    this.modalTitle = config.data.modalTitle;
-  }
-
-  togglePassword() {
-    this.showPassword = !this.showPassword;
-  }
-
-  async submit() {
-    const secret = this.myGroup.get("secret").value;
-
-    try {
-      await this.userVerificationService.verifyUser(secret);
-    } catch (e) {
-      this.modalRef.close(false);
-      return;
-    }
-
-    this.modalRef.close(true);
-  }
-}

libs/angular/src/services/userSecretPrompt.service.ts

@@ -1,54 +0,0 @@
-import { Injectable } from "@angular/core";
-
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
-import { UserSecretPromptService as UserSecretPromptServiceAbstraction } from "@bitwarden/common/abstractions/userSecretPrompt.service";
-
-import { UserSecretPromptComponent } from "../components/user-secret-prompt.component";
-
-import { ModalService } from "./modal.service";
-
-/**
- * Used to verify the user's File Password for the "Import passwords using File Password" feature only.
- */
-@Injectable()
-export class UserSecretPromptService implements UserSecretPromptServiceAbstraction {
-  protected component = UserSecretPromptComponent;
-
-  constructor(
-    private modalService: ModalService,
-    private keyConnectorService: KeyConnectorService
-  ) {}
-
-  protectedFields() {
-    return ["TOTP", "Password", "H_Field", "Card Number", "Security Code"];
-  }
-
-  async showPasswordPrompt(
-    confirmDescription: string,
-    confirmButtonText: string,
-    modalTitle: string
-  ) {
-    if (!(await this.enabled())) {
-      return true;
-    }
-
-    const ref = await this.modalService.open(this.component, {
-      allowMultipleModals: true,
-      data: {
-        confirmDescription: confirmDescription,
-        confirmButtonText: confirmButtonText,
-        modalTitle: modalTitle,
-      },
-    });
-
-    if (ref == null) {
-      return false;
-    }
-
-    return (await ref.onClosedPromise()) === true;
-  }
-
-  async enabled() {
-    return !(await this.keyConnectorService.getUsesKeyConnector());
-  }
-}