bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 01:33:33 +00:00
Code Issues Releases Wiki Activity

Password reprompt fixes (#926)

Browse Source 
* Hide card number when hidden

* Avoid double password prompts

* Bump jslib
This commit is contained in:
Oscar Hinton
2021-05-28 20:08:44 +02:00
committed by GitHub
parent c89da7f12b
commit c7345197f7
5 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/vault/vault.component.ts
View File

@@ -229,9 +229,7 @@ export class VaultComponent implements OnInit, OnDestroy {
}
async viewCipher(cipher: CipherView) {
if (this.action === 'view' && this.cipherId === cipher.id) {
return;
} else if (this.dirtyInput() && await this.wantsToSaveChanges()) {
if (!await this.canNavigateAway('view', cipher)) {
return;
}
@@ -328,11 +326,17 @@ export class VaultComponent implements OnInit, OnDestroy {
}
async editCipher(cipher: CipherView) {
if (this.action === 'edit' && this.cipherId === cipher.id) {
if (!await this.canNavigateAway('edit', cipher)) {
return;
} else if (this.dirtyInput() && await this.wantsToSaveChanges()) {
} else if (!await this.passwordReprompt(cipher)) {
return;
} else if (cipher.reprompt !== CipherRepromptType.None && !await this.passwordRepromptService.showPasswordPrompt()) {
}
await this.editCipherWithoutPasswordPrompt(cipher);
}
async editCipherWithoutPasswordPrompt(cipher: CipherView) {
if (!await this.canNavigateAway('edit', cipher)) {
return;
}
@@ -342,11 +346,17 @@ export class VaultComponent implements OnInit, OnDestroy {
}
async cloneCipher(cipher: CipherView) {
if (this.action === 'clone' && this.cipherId === cipher.id) {
if (!await this.canNavigateAway('clone', cipher)) {
return;
} else if (this.dirtyInput() && await this.wantsToSaveChanges()) {
} else if (!await this.passwordReprompt(cipher)) {
return;
} else if (cipher.reprompt !== CipherRepromptType.None && !await this.passwordRepromptService.showPasswordPrompt()) {
}
await this.cloneCipherWithoutPasswordPrompt(cipher);
}
async cloneCipherWithoutPasswordPrompt(cipher: CipherView) {
if (!await this.canNavigateAway('edit', cipher)) {
return;
}
@@ -356,9 +366,7 @@ export class VaultComponent implements OnInit, OnDestroy {
}
async addCipher(type: CipherType = null) {
if (this.action === 'add') {
return;
} else if (this.dirtyInput() && await this.wantsToSaveChanges()) {
if (!await this.canNavigateAway('add', null)) {
return;
}
@@ -680,4 +688,19 @@ export class VaultComponent implements OnInit, OnDestroy {
this.addOrganizationId = null;
this.addCollectionIds = null;
}
private async canNavigateAway(action: string, cipher?: CipherView) {
// Don't navigate to same route
if (this.action === action && (cipher == null || this.cipherId === cipher.id)) {
return false;
} else if (this.dirtyInput() && await this.wantsToSaveChanges()) {
return false;
}
return true;
}
private async passwordReprompt(cipher: CipherView) {
return cipher.reprompt === CipherRepromptType.None || await this.passwordRepromptService.showPasswordPrompt();
}
}