Skip to content

Commit e10261e

Browse files
committed
fix(service): Corrected issue with interceptor not having implemented beforeRequest method
1 parent 3dd4d09 commit e10261e

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

src/interceptor-service.ts

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -240,23 +240,26 @@ export class InterceptorService extends Http {
240240
return Observable.of(requestBuilder.build());
241241
}
242242

243-
const processedRequest = interceptor.beforeRequest(request, index);
244-
let processedRequest$: Observable<InterceptorRequest>;
245-
246-
if (!processedRequest) { // if no request is returned; just proceed with the original request
247-
processedRequest$ = Observable.of(request);
248-
} else if (processedRequest instanceof Observable) {
249-
processedRequest$ = <Observable<InterceptorRequest>>processedRequest;
250-
} else {
251-
processedRequest$ = Observable.of(<InterceptorRequest>processedRequest);
243+
if (interceptor.beforeRequest !== undefined) {
244+
const processedRequest = interceptor.beforeRequest(request, index);
245+
let processedRequest$: Observable<InterceptorRequest>;
246+
247+
if (!processedRequest) { // if no request is returned; just proceed with the original request
248+
processedRequest$ = Observable.of(request);
249+
} else if (processedRequest instanceof Observable) {
250+
processedRequest$ = <Observable<InterceptorRequest>>processedRequest;
251+
} else {
252+
processedRequest$ = Observable.of(<InterceptorRequest>processedRequest);
253+
}
254+
return processedRequest$
255+
.catch((err: any, caught: Observable<InterceptorRequest>) => {
256+
const responseBuilder = InterceptorRequestBuilderInternal.new(request)
257+
.err(err)
258+
.errEncounteredAt(index);
259+
return Observable.of(responseBuilder.build());
260+
});
252261
}
253-
return processedRequest$
254-
.catch((err: any, caught: Observable<InterceptorRequest>) => {
255-
const responseBuilder = InterceptorRequestBuilderInternal.new(request)
256-
.err(err)
257-
.errEncounteredAt(index);
258-
return Observable.of(responseBuilder.build());
259-
});
262+
return Observable.of(request);
260263
});
261264
}
262265

0 commit comments

Comments
 (0)