This commit is contained in:
Peter Maquiran
2022-12-19 17:09:25 +01:00
parent a2717726cd
commit 75884cde98
2 changed files with 0 additions and 6 deletions
-4
View File
@@ -21,17 +21,14 @@ export class AuthGuard implements CanActivate {
canActivate(
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
console.log('hire!', state.url)
// if user not active
if(!SessionStore.user.Inactivity) {
console.log(' goto login /')
this.router.navigate(['/']);
return false
}
// if session doesn't exit
else if(!SessionStore.exist) {
console.log(' goto /')
this.router.navigate(['/']);
return false
} else {
@@ -72,7 +69,6 @@ export class AuthGuard implements CanActivate {
}
} else if (pathname.startsWith('/home/events')) {
if(SessionStore.user.OwnerCalendars.length >= 1 || this.p.userPermission([this.p.permissionList.Gabinete.access])) {
console.log('go /home/events')
return true
} else {
this.router.navigate(['/login']);
-2
View File
@@ -19,10 +19,8 @@ export class LoginGuard implements CanActivate {
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
console.log('hire login!', state.url)
if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
console.log(' goto /home/events')
this.router.navigate(['/home/events']);
return false
} else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && !this.platform.is('desktop') && !this.platform.is('mobileweb')) {