fix(service): Corrected issue with interceptor not having implemented…

… beforeRequest method
1tontech · Feb 2, 2017 · e10261e · e10261e
1 parent 3dd4d09
commit e10261e
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/src/interceptor-service.ts b/src/interceptor-service.ts
@@ -240,23 +240,26 @@ export class InterceptorService extends Http {
             return Observable.of(requestBuilder.build());
           }
 
-          const processedRequest = interceptor.beforeRequest(request, index);
-          let processedRequest$: Observable<InterceptorRequest>;
-
-          if (!processedRequest) { // if no request is returned; just proceed with the original request
-            processedRequest$ = Observable.of(request);
-          } else if (processedRequest instanceof Observable) {
-            processedRequest$ = <Observable<InterceptorRequest>>processedRequest;
-          } else {
-            processedRequest$ = Observable.of(<InterceptorRequest>processedRequest);
+          if (interceptor.beforeRequest !== undefined) {
+            const processedRequest = interceptor.beforeRequest(request, index);
+            let processedRequest$: Observable<InterceptorRequest>;
+
+            if (!processedRequest) { // if no request is returned; just proceed with the original request
+              processedRequest$ = Observable.of(request);
+            } else if (processedRequest instanceof Observable) {
+              processedRequest$ = <Observable<InterceptorRequest>>processedRequest;
+            } else {
+              processedRequest$ = Observable.of(<InterceptorRequest>processedRequest);
+            }
+            return processedRequest$
+              .catch((err: any, caught: Observable<InterceptorRequest>) => {
+                const responseBuilder = InterceptorRequestBuilderInternal.new(request)
+                  .err(err)
+                  .errEncounteredAt(index);
+                return Observable.of(responseBuilder.build());
+              });
           }
-          return processedRequest$
-            .catch((err: any, caught: Observable<InterceptorRequest>) => {
-              const responseBuilder = InterceptorRequestBuilderInternal.new(request)
-                .err(err)
-                .errEncounteredAt(index);
-              return Observable.of(responseBuilder.build());
-            });
+          return Observable.of(request);
         });
     }