fix: interceptor fixes to make new call if access_token is not presen…

…t and not throw access_token errors to sentry (#3263)
fylein · Nov 18, 2024 · fbf0c91 · fbf0c91
1 parent 57df4fb
commit fbf0c91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/app/core/interceptors/httpInterceptor.spec.ts b/src/app/core/interceptors/httpInterceptor.spec.ts
@@ -168,8 +168,7 @@ describe('HttpConfigInterceptor', () => {
       routerAuthService.fetchAccessToken.and.rejectWith(new Error('error'));
 
       httpInterceptor.refreshAccessToken().subscribe({
-        error: (err) => {
-          expect(err).toBeTruthy();
+        complete: () => {
           expect(userEventService.logout).toHaveBeenCalledTimes(1);
           expect(secureStorageService.clearAll).toHaveBeenCalledTimes(1);
           expect(storageService.clearAll).toHaveBeenCalledTimes(1);

diff --git a/src/app/core/interceptors/httpInterceptor.ts b/src/app/core/interceptors/httpInterceptor.ts
@@ -9,7 +9,7 @@ import {
 } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-import { BehaviorSubject, Observable, forkJoin, from, iif, of, throwError } from 'rxjs';
+import { BehaviorSubject, EMPTY, Observable, forkJoin, from, iif, of, throwError } from 'rxjs';
 import { catchError, concatMap, filter, mergeMap, take } from 'rxjs/operators';
 
 import { JwtHelperService } from '../services/jwt-helper.service';
@@ -67,12 +67,12 @@ export class HttpConfigInterceptor implements HttpInterceptor {
   refreshAccessToken(): Observable<string> {
     return from(this.tokenService.getRefreshToken()).pipe(
       concatMap((refreshToken) => this.routerAuthService.fetchAccessToken(refreshToken)),
-      catchError((error) => {
+      catchError(() => {
         this.userEventService.logout();
         this.secureStorageService.clearAll();
         this.storageService.clearAll();
         globalCacheBusterNotifier.next();
-        return throwError(error);
+        return EMPTY;
       }),
       concatMap((authResponse) => this.routerAuthService.newAccessToken(authResponse.access_token)),
       concatMap(() => from(this.tokenService.getAccessToken()))
@@ -88,7 +88,7 @@ export class HttpConfigInterceptor implements HttpInterceptor {
   getAccessToken(): Observable<string> {
     return from(this.tokenService.getAccessToken()).pipe(
       concatMap((accessToken) => {
-        if (this.expiringSoon(accessToken)) {
+        if (!accessToken || this.expiringSoon(accessToken)) {
           if (!this.accessTokenCallInProgress) {
             this.accessTokenCallInProgress = true;
             this.accessTokenSubject.next(null);
@@ -168,7 +168,7 @@ export class HttpConfigInterceptor implements HttpInterceptor {
                 this.secureStorageService.clearAll();
                 this.storageService.clearAll();
                 globalCacheBusterNotifier.next();
-                return throwError(error);
+                return EMPTY;
               }
             }
             return throwError(error);