Fix guard loop

This commit is contained in:
Peter Maquiran
2021-09-03 17:11:13 +01:00
parent 70d280af0e
commit b43693df2f
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -18,9 +18,9 @@ export class AuthGuard implements CanActivate {
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
if(!SessionStore.user.Inactivity) {
this.router.navigate(['/inactivity']);
this.router.navigate(['/']);
}
else if(window.location.pathname != '' && !SessionStore.exist) {
else if(!SessionStore.exist) {
this.router.navigate(['/']);
return false
} else {
+1
View File
@@ -17,6 +17,7 @@ export class LoginGuard implements CanActivate {
// console.log(SessionStore.exist, SessionStore.user.Inactivity, SessionStore.user.LoginPreference)
console.log(SessionStore.exist, SessionStore.user.Inactivity, SessionStore.user.LoginPreference)
if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
this.router.navigate(['/home/events']);
return false