From 18e57272f2175e31b41ef3068e097d49a9e8ddd7 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Tue, 27 Dec 2022 15:10:02 +0300 Subject: [PATCH] Re-add wait service on core api.interceptor.ts --- .../src/lib/interceptors/api.interceptor.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts b/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts index f7dd03267e..1e85cc4716 100644 --- a/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts +++ b/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts @@ -1,23 +1,21 @@ -import { - HttpEvent, - HttpHandler, - HttpHeaders, - HttpInterceptor, - HttpRequest, -} from '@angular/common/http'; +import { HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; +import { finalize } from 'rxjs/operators'; +import { HttpWaitService } from '../services'; @Injectable({ providedIn: 'root', }) export class ApiInterceptor implements IApiInterceptor { + constructor(private httpWaitService: HttpWaitService) {} + getAdditionalHeaders(existingHeaders?: HttpHeaders) { return existingHeaders; } - intercept(req: HttpRequest, next: HttpHandler): Observable> { - return next.handle(req); + intercept(request: HttpRequest, next: HttpHandler) { + this.httpWaitService.addRequest(request); + return next.handle(request).pipe(finalize(() => this.httpWaitService.deleteRequest(request))); } }