bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-12 22:44:11 +00:00
Code Issues Releases Wiki Activity

Updates to error handling

Browse Source
This commit is contained in:
CarleyDiaz-Bitwarden
2022-06-20 14:56:57 -04:00
parent f5c78590db
commit 15949ed8bc
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/web/src/app/tools/import.component.ts
View File

@@ -114,12 +114,16 @@ export class ImportComponent implements OnInit {
if (error != null) {
//Check if the error is that a password is required
if (error.passwordRequired) {
if (await this.promptPassword(fileContents)) {
if (await this.promptFilePassword(fileContents)) {
//successful
} else {
//failed
this.error(error); //TODO different error
//failed - File Password issues
this.loading = false;
this.platformUtilsService.showToast(
"error",
this.i18nService.t("error"),
this.i18nService.t("invalidMasterPassword")
);
return;
}
} else {
@@ -139,7 +143,7 @@ export class ImportComponent implements OnInit {
this.loading = false;
}
private async promptPassword(fcontents: string) {
private async promptFilePassword(fcontents: string) {
return await this.filePasswordPromptService.showPasswordPrompt(fcontents, this.organizationId);
}