diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index a57d6b27..136c975a 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -42,14 +42,18 @@ export class AuthGuard extends ACLGuard { canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): Observable { if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) { - return this.handle(route, _state, 1); + return super.canActivate(route, _state); } else { - return this.handle(route, _state, 1, _state?.url); + return super.canActivate(route, _state); } } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url)); + if (childRoute.routeConfig?.loadChildren) { + return super.canActivateChild(childRoute, state); + } else { + return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url)); + } } private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable {