Sm 89 ee (#3418)
* Rough draft of Export/Import changes w/ password encryption * fix for encrypted export changes * Create launch.json * Updates to export logic modal user secret prompt * Updates to error handling * renaming the component for checking the user secret to a name that is more clear about what it accomplishes * Fixing lint errors * Adding a comment * Suggested changes from CR * Suggested changes from CR * Making suggested changes * removing unnecessary properties * changes suggested * Fix * Updating error messages * Removing unecessary launch.json file commit * running lint, removing commented code * removing launch.json * Updates to remove the userVerificationPromptService * updates * Removing unused import, running npm prettier/lint * Changes to use Form Fields * Updates * updates requested by Matt * Update apps/web/src/app/tools/import-export/export.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Suggested Changes from PR * Fix after merge from Master * changes to styling * Removing unused code and cleanup * Update libs/angular/src/components/user-verification-prompt.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Update apps/web/src/locales/en/messages.json Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Changes suggested by Thomas R * Merging master into branch * Revert "Merging master into branch" This reverts commiteb2cdffe49
. * Requested changes and improvements * merging master into feature branch * Revert "merging master into feature branch" This reverts commite287715251
. * Suggested Changes * changes * requested changes * Requested changes * removing comments, fixing code * reducing copied code * fixing bug * fixing bug * changes * WIP * Thomas's requested changes * adding back missing spaces * change needed after the merge from master into feature branch * prettier + lint * Updating the EncryptedExportType Import * Fixing build errors Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com> * Move FilePasswordPrompt to ImportExportModule Also remove base class Also remove duplicate service providers * Run prettier * Suggested Changes from Thomas * only require filePassword and confirmFilePassword if it's type is FileEncrypted * Update to only enable the field when submitting a file password encrypted file * Requested changes, moving logic to web * undoing change to bit button * Refactor to process file-encrypted imports in main import.component * Refactor confirm file password check * Remove UserVerificationPromptService * Address CodeScene feedback * Updates to disable the required file password field when needed * Subscribe to reactive form changes to adjust validators * style changes requested by suhkleen * Delete duplicate classes * Fixing storybook issue * Updating copy for encrypted export Co-authored-by: CarleyDiaz-Bitwarden <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Thomas Rittson <trittson@bitwarden.com> Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com>
This commit is contained in:
parent
25207c2858
commit
8f7ee4eba2
|
@ -14,7 +14,7 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv
|
||||||
import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
|
import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
|
||||||
import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType";
|
import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType";
|
||||||
|
|
||||||
import { UserVerificationPromptComponent } from "src/app/components/user-verification-prompt.component";
|
import { UserVerificationPromptComponent } from "../../components/user-verification-prompt.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-export",
|
selector: "app-export",
|
||||||
|
|
|
@ -912,10 +912,10 @@
|
||||||
"message": "Confirm File Password"
|
"message": "Confirm File Password"
|
||||||
},
|
},
|
||||||
"accountBackupOptionDescription": {
|
"accountBackupOptionDescription": {
|
||||||
"message": "Leverages your Bitwarden account encryption, not master password, to protect the export. This export can only be imported into the current account. Use this to create a backup that cannot be used elsewhere."
|
"message": "Use your account encryption key to encrypt the export and restrict import to only the current Bitwarden account."
|
||||||
},
|
},
|
||||||
"passwordProtectedOptionDescription": {
|
"passwordProtectedOptionDescription": {
|
||||||
"message": "Create a user-generated password to protect the export. Use this to create an export that can be used in other accounts."
|
"message": "Set a password to encrypt the export and import it to any Bitwarden account using the password for decryption."
|
||||||
},
|
},
|
||||||
"fileTypeHeading": {
|
"fileTypeHeading": {
|
||||||
"message": "File Type"
|
"message": "File Type"
|
||||||
|
|
Loading…
Reference in New Issue