This commit is contained in:
Taric Xin
2022-01-24 20:52:26 +08:00
parent 89e05507b6
commit 66177af625
3 changed files with 26 additions and 28 deletions

View File

@ -1,17 +1,5 @@
import { Inject, Injectable, Injector } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
CanActivateChild,
CanLoad,
Route,
Router,
RouterStateSnapshot,
UrlSegment,
UrlTree
} from '@angular/router';
import { sysConf } from '@conf/sys.conf';
import { CoreService } from '@core';
import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, RouterStateSnapshot } from '@angular/router';
import { ACLGuard, ACLService } from '@delon/acl';
import { MenuService } from '@delon/theme';
import { BaseService, EAUserService } from '@shared';
@ -21,31 +9,43 @@ import { map } from 'rxjs/operators';
const auths = ['YUNLI-CART-SEARCH', 'YUNLI-CART-DAOC1HU', 'YUNLI-CART-DETAIL', 'YUNLI-CART-AUDIT-SEARCH'];
@Injectable()
export class AuthGuard implements CanActivate, CanActivateChild, CanLoad {
constructor(private srv: ACLService, router: Router, private baseService: BaseService, private menuService: MenuService) {}
canLoad(route: Route, segments: UrlSegment[]): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
return true;
}
export class AuthGuard implements CanActivate, CanActivateChild {
constructor(private srv: ACLService, private baseService: BaseService, private menuService: MenuService) {}
canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot | null): Observable<boolean> {
return this.handle();
if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) {
return this.handle();
} else {
return this.handle(_state?.url);
}
}
canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
return this.handle();
return this.handle(this.settingRoute(childRoute.params, state.url));
}
private handle(): Observable<boolean> {
// 1
return this.baseService.request('/api/mdc/cuc/user/getUserDetail').pipe(
private handle(route?: string): Observable<boolean> {
if (!route) {
return of(true);
}
console.log(route);
return this.baseService.request('/api/mdc/cuc/user/getUserDetail', { link: route }).pipe(
map(_ => {
console.log(this.srv.data);
this.srv.setAbility(auths);
this.menuService.resume();
console.log(this.srv.data);
return true;
})
);
}
private settingRoute(params: any, route: string) {
let _route = route;
for (const key of Object.keys(params)) {
if (_route.indexOf(params[key]) > -1) {
_route = _route.replace(params[key], ':id');
}
}
return _route;
}
}