Interceptors apply only to our API

Author: Bernardo-MG

src/app/authentication/interceptor/basic-authentication.interceptor.ts

@@ -1,5 +1,6 @@
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { environment } from '@environments/environment';
 import { Observable } from 'rxjs';
 import { AuthenticationService } from '../service/authentication.service';
 
@@ -18,16 +19,26 @@ export class BasicAuthenticationInterceptor implements HttpInterceptor {
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     let authReq;
 
-    // Acquire the current user token
-    const token = this.authenticationService.getUser().token;
+    const isApiUrl = request.url.startsWith(environment.apiUrl);
 
-    if (token) {
-      // Has token
-      // It is added to the request
-      authReq = request.clone({ headers: request.headers.set(this.tokenHeaderKey, `${this.tokenHeaderIdentifier} ${token}`) });
+    if (isApiUrl) {
+      // It is a request to our API
+
+      // Acquire the current user token
+      const logged = this.authenticationService.getUser().logged;
+      const token = this.authenticationService.getUser().token;
+
+      if ((logged) && (token)) {
+        // Has token
+        // It is added to the request
+        authReq = request.clone({ headers: request.headers.set(this.tokenHeaderKey, `${this.tokenHeaderIdentifier} ${token}`) });
+      } else {
+        // No token
+        // No changes to request
+        authReq = request;
+      }
     } else {
-      // No token
-      // No changes to request
+      // External API
       authReq = request;
     }
 

src/app/authentication/interceptor/unauthorized.interceptor.ts

@@ -1,5 +1,6 @@
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { environment } from '@environments/environment';
 import { catchError, Observable, throwError } from 'rxjs';
 import { AuthenticationService } from '../service/authentication.service';
 
@@ -11,16 +12,26 @@ export class UnauthorizedInterceptor implements HttpInterceptor {
   ) { }
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
-    return next.handle(request).pipe(catchError(err => {
-      if (err.status === 401) {
-        // Unauthenticated
-        // Logs out
-        this.authenticationService.logout();
-        location.reload();
-      }
+    return next.handle(request).pipe(catchError(error => {
+
+      const isApiUrl = request.url.startsWith(environment.apiUrl);
+
+      if (isApiUrl) {
+        // It is a request to our API
 
-      const error = err.error.message || err.statusText;
-      return throwError(() => new Error(error));
+        if (error.status === 401) {
+          // Unauthenticated
+          // Logs out
+          this.authenticationService.logout();
+          location.reload();
+        }
+
+        const errorMessage = error.error.message || error.statusText;
+        return throwError(() => new Error(errorMessage));
+      } else {
+        // External API
+        return throwError(() => error);
+      }
     }))
   }