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

move legacy check below auth check in lock guard (#6696)

This commit is contained in:
Jake Fink 2023-10-25 13:02:20 -04:00 committed by GitHub
parent 70f2805ccc
commit 8dd17bd55a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/angular/src/auth/guards/lock.guard.ts
View File

@ -33,6 +33,11 @@ export function lockGuard(): CanActivateFn {
const router = inject(Router); const router = inject(Router);
const userVerificationService = inject(UserVerificationService); const userVerificationService = inject(UserVerificationService);
const authStatus = await authService.getAuthStatus();
if (authStatus !== AuthenticationStatus.Locked) {
return router.createUrlTree(["/"]);
}
// If legacy user on web, redirect to migration page // If legacy user on web, redirect to migration page
if (await cryptoService.isLegacyUser()) { if (await cryptoService.isLegacyUser()) {
if (platformUtilService.getClientType() === ClientType.Web) { if (platformUtilService.getClientType() === ClientType.Web) {
@ -43,11 +48,6 @@ export function lockGuard(): CanActivateFn {
return false; return false;
} }
const authStatus = await authService.getAuthStatus();
if (authStatus !== AuthenticationStatus.Locked) {
return router.createUrlTree(["/"]);
}
// User is authN and in locked state. // User is authN and in locked state.
const tdeEnabled = await deviceTrustCryptoService.supportsDeviceTrust(); const tdeEnabled = await deviceTrustCryptoService.supportsDeviceTrust();