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

Fix lockGuard logic (#384) 

* Fix lockGuard logic

* add missing return values
This commit is contained in:
Thomas Rittson 2021-05-20 21:05:17 +10:00 committed by GitHub
parent 3ab710389b
commit 5f1ad85dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/angular/services/lock-guard.service.ts
View File

@ -13,17 +13,18 @@ export class LockGuardService implements CanActivate {
private router: Router) { } private router: Router) { }
async canActivate() { async canActivate() {
const locked = await this.vaultTimeoutService.isLocked();
if (!locked) {
const isAuthed = await this.userService.isAuthenticated(); const isAuthed = await this.userService.isAuthenticated();
if (!isAuthed) { if (isAuthed) {
this.router.navigate(['login']); const locked = await this.vaultTimeoutService.isLocked();
if (locked) {
return true;
} else { } else {
this.router.navigate(['vault']); this.router.navigate(['vault']);
}
return false; return false;
} }
}
return true; this.router.navigate(['']);
return false;
} }
} }