micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-9363: refactor

Browse source
This commit is contained in:
adel.ka 2025-09-01 15:33:55 +03:00
parent dd92b1f5b6
commit 32a5c79cc8
2 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/ts/modules/app/interceptor/permission.interceptor.service.ts
View file

@ -9,20 +9,19 @@ export class PermissionInterceptor implements HttpInterceptor {
} }
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
return from(this.handlePermissions(request, next)); return from(
} this.permissionProvider.getUserPermissions()
.then(permissions => {
private async handlePermissions(request: HttpRequest<any>,
next: HttpHandler): Promise<HttpEvent<any>> {
const permissions = await this.permissionProvider.getUserPermissions();
if (permissions.length > 0) { if (permissions.length > 0) {
request = request.clone({ return request.clone({
setHeaders: { setHeaders: {
'X-User-Permissions': permissions.join(',') 'X-User-Permissions': permissions.join(','),
} },
}); });
} }
return request;
return next.handle(request).toPromise(); })
.then(modifiedRequest => next.handle(modifiedRequest).toPromise())
);
} }
} }

14
frontend/src/ts/modules/app/interceptor/token.interceptor.service.ts
View file

@ -8,14 +8,14 @@ export class TokenInterceptor implements HttpInterceptor{
constructor(protected tokenProvider: TokenProvider) { } constructor(protected tokenProvider: TokenProvider) { }
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
return from(this.handle(request, next)) return from(
} this.tokenProvider.getToken()
.then(token => {
private async handle(request: HttpRequest<any>, next: HttpHandler): Promise<HttpEvent<any>> { return request.clone({
const token = await this.tokenProvider.getToken();
request = request.clone({
setHeaders: {Authorization: `Bearer ${token}`} setHeaders: {Authorization: `Bearer ${token}`}
}); });
return next.handle(request).toPromise(); })
.then(modifiedRequest => next.handle(modifiedRequest).toPromise())
);
} }
} }