bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-14 23:33:16 +00:00
Code Issues Releases Wiki Activity

implement hasKey helper

Browse Source
This commit is contained in:
Kyle Spearrin
2018-06-13 17:21:27 -04:00
parent e714d61a66
commit 94c5bdb5aa
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/accounts/lock.component.ts
View File

@@ -33,10 +33,9 @@ export class LockComponent extends BaseLockComponent implements OnInit {
async ngOnInit() { async ngOnInit() {
const authed = await this.userService.isAuthenticated(); const authed = await this.userService.isAuthenticated();
const key = await this.cryptoService.getKey();
if (!authed) { if (!authed) {
this.router.navigate(['/']); this.router.navigate(['/']);
} else if (key != null) { } else if (await this.cryptoService.hasKey()) {
this.router.navigate(['vault']); this.router.navigate(['vault']);
} }

4
src/app/services/unauth-guard.service.ts
View File

@@ -15,8 +15,8 @@ export class UnauthGuardService implements CanActivate {
async canActivate() { async canActivate() {
const isAuthed = await this.userService.isAuthenticated(); const isAuthed = await this.userService.isAuthenticated();
if (isAuthed) { if (isAuthed) {
const key = await this.cryptoService.getKey(); const hasKey = await this.cryptoService.hasKey();
if (key == null) { if (!hasKey) {
this.router.navigate(['lock']); this.router.navigate(['lock']);
} else { } else {
this.router.navigate(['vault']); this.router.navigate(['vault']);