fix error messaging

Author: Shayan1375

src/app/core/interceptors/oauth.interceptor.ts

@@ -1,6 +1,6 @@
-import { catchError } from 'rxjs/operators';
+import { catchError, tap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
+import { OAuthService } from 'angular-oauth2-oidc';
 import { Observable, throwError } from 'rxjs';
 import {
   HttpErrorResponse,
@@ -16,42 +16,50 @@ export class OAuthInterceptor implements HttpInterceptor {
   excludedUrls = ['assets', '/assets'];
   excludedUrlsRegEx = this.excludedUrls.map((url) => new RegExp('^' + url, 'i'));
 
-  constructor(
-    private oauthService: OAuthService,
-    private authStorage: OAuthStorage,
-    private snackbar: SnackbarService
-  ) {}
+  constructor(private oauthService: OAuthService, private snackbar: SnackbarService) {}
 
   private isExcluded(req: HttpRequest<any>): boolean {
     return this.excludedUrlsRegEx.some((toBeExcluded) => toBeExcluded.test(req.url));
   }
+
   public intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     if (this.isExcluded(req)) {
       return next.handle(req);
     }
-    const token = this.authStorage.getItem('access_token');
-    const headers = req.headers.set('Authorization', 'Bearer ' + token);
-    req = req.clone({ headers });
+    const token = this.getToken();
+    if (token) {
+      const headers = req.headers.set('Authorization', 'Bearer ' + token);
+      req = req.clone({ headers });
+    }
     return next.handle(req).pipe(
       catchError((error: HttpErrorResponse) => {
+        console.error('OAuthInterceptor: Error occurred', error);
         if (error.status === 401) {
           this.oauthService.logOut();
         }
         if (error.status === 404) {
           this.handleErrorCodes(error.status);
         }
-        if (error.error.issue) {
+        if (error.error?.issue) {
           this.handleErrorCodes(error.error.issue[0]?.code);
         }
-        if (error.error.issues) {
-          this.handleErrorCodes(error.error.issues[0]?.code, error.headers.get('Retry-After'));
+        if (error.error?.issues) {
+          const retryAfter = error.headers.get('Retry-After');
+          this.handleErrorCodes(error.error.issues[0]?.code, Number(retryAfter));
         }
         return throwError(error);
       })
     );
   }
 
-  public handleErrorCodes(errorCode, retryAfter?) {
+  private getToken(): string | null {
+    if (this.oauthService.hasValidAccessToken()) {
+      return this.oauthService.getAccessToken();
+    }
+    return null;
+  }
+
+  public handleErrorCodes(errorCode, retryAfter?: number) {
     this.snackbar.displayErrorMessage(errorCode, retryAfter);
   }
 }