devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

cant be pin locked without key

This commit is contained in:
Kyle Spearrin 2019-02-13 22:08:55 -05:00
parent 0bdbfd7984
commit 43872f82cc
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/services/lock.service.ts
View File

@ -35,10 +35,10 @@ export class LockService implements LockServiceAbstraction {
}
async isLocked(): Promise<boolean> {
if (this.pinLocked) {
const hasKey = await this.cryptoService.hasKey();
if (hasKey && this.pinLocked) {
return true;
}
const hasKey = await this.cryptoService.hasKey();
return !hasKey;
}
@ -48,13 +48,7 @@ export class LockService implements LockServiceAbstraction {
return;
}
if (this.pinLocked) {
return;
}
const hasKey = await this.cryptoService.hasKey();
if (!hasKey) {
// no key so no need to lock
if (this.isLocked()) {
return;
}
@ -83,7 +77,11 @@ export class LockService implements LockServiceAbstraction {
if (allowSoftLock) {
const pinSet = await this.isPinLockSet();
if (pinSet[0]) {
await this.pinLock();
this.pinLocked = true;
this.messagingService.send('locked');
if (this.lockedCallback != null) {
await this.lockedCallback();
}
return;
}
}
@ -119,12 +117,4 @@ export class LockService implements LockServiceAbstraction {
clear(): Promise<any> {
return this.storageService.remove(ConstantsService.protectedPin);
}
private async pinLock(): Promise<void> {
this.pinLocked = true;
this.messagingService.send('locked');
if (this.lockedCallback != null) {
await this.lockedCallback();
}
}
}