diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 603848abc..f1b5506ee 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -36,11 +36,11 @@ export class AuthGuard implements CanActivate { this.authService.loginChat(); } - const pathname = window.location.pathname + const pathname = state.url - if(this.p.userPermission(pathname.startsWith('/home/agenda'))) { + if(pathname.startsWith('/home/agenda')) { - if(this.p.permissionList.Agenda.access) { + if(this.p.userPermission(this.p.permissionList.Agenda.access)) { return true; } else { this.router.navigate(['/login']); @@ -57,7 +57,7 @@ export class AuthGuard implements CanActivate { } } else if(pathname.startsWith('/home/chat')) { - if(this.p.userPermission(this.p.permissionList.Actions.access)) { + if(this.p.userPermission(this.p.permissionList.Chat.access)) { return true; } else { this.router.navigate(['/login']); @@ -71,14 +71,15 @@ export class AuthGuard implements CanActivate { return false } } else if (pathname.startsWith('/home/events')) { - if((this.p.userPermission(SessionStore.user.OwnerCalendars.length >= 1 || this.p.userPermission([this.p.permissionList.Gabinete.access]))) { + if(SessionStore.user.OwnerCalendars.length >= 1 || this.p.userPermission([this.p.permissionList.Gabinete.access])) { return true } else { this.router.navigate(['/login']); return false } } else if (pathname == '/') { - return true + this.router.navigate(['/login']); + return false } else { this.router.navigate(['/login']); return false diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 75227f2c7..d6c13e52a 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,6 +1,6 @@ -
+