This commit is contained in:
Taric Xin
2022-02-09 16:59:09 +08:00
parent cb7ef02e64
commit aa44534eab
9 changed files with 113 additions and 85 deletions

View File

@ -1,5 +1,5 @@
/*
* @Description :
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-25 16:03:45
@ -28,39 +28,56 @@ import { Observable, of } from 'rxjs';
import { delay, map, switchMap, tap } from 'rxjs/operators';
@Injectable()
export class AuthGuard implements CanActivate, CanActivateChild {
export class AuthGuard extends ACLGuard {
constructor(
private srv: ACLService,
srv: ACLService,
public srv1: ACLService,
private baseService: BaseService,
private menuService: MenuService,
private router: Router,
private injector: Injector
) {}
router: Router,
private inject: Injector
) {
super(srv, router, inject);
}
canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot | null): Observable<boolean> {
canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): Observable<boolean> {
if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) {
return this.handle();
return this.handle(route, _state, 1);
} else {
return this.handle(_state?.url);
return this.handle(route, _state, 1, _state?.url);
}
}
canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
return this.handle(this.settingRoute(childRoute.params, state.url));
return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url));
}
private handle(route?: string): Observable<boolean> {
if (!route) {
return of(true);
private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable<boolean> {
if (!router) {
if (type === 1) {
return super.canActivate(route, state);
} else {
return super.canActivateChild(route, state);
}
}
return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: route }).pipe(
// console.log(route, state, type, router);
return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: router }).pipe(
switchMap(res => {
if (res) {
this.srv.setAbility(res.permissionsCodeList || []);
// if (router === '/ticket/invoice-requested') {
// this.srv1.setAbility(['TICKET-INVOICE-REQUESTED-list']);
// } else {
// this.srv1.setAbility(res.abilities || []);
// }
this.srv1.setAbility(res.abilities || []);
this.menuService.resume();
}
return of(true);
if (type === 1) {
return super.canActivate(route, state);
} else {
return super.canActivateChild(route, state);
}
})
);
}