add refresh token

admin/src/app/auth/jwt.interceptor.ts

@@ -7,12 +7,13 @@ import {
   HttpErrorResponse,
 } from '@angular/common/http';
 import { Observable, throwError, BehaviorSubject } from 'rxjs';
-import { catchError, switchMap, filter, take } from 'rxjs/operators';
+import { catchError, switchMap, filter, take, finalize } from 'rxjs/operators'; // Import finalize
 import { AuthService } from './auth.service';
 
 @Injectable()
 export class JwtInterceptor implements HttpInterceptor {
   private isRefreshing = false;
+  // Initialize refreshTokenSubject with null
   private refreshTokenSubject: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   constructor(private authService: AuthService) {}
@@ -21,8 +22,11 @@ export class JwtInterceptor implements HttpInterceptor {
     request: HttpRequest<any>,
     next: HttpHandler
   ): Observable<HttpEvent<any>> {
-    const accessToken = this.authService.getAccessToken();
+    if (request.url.includes('/auth/refresh')) {
+      return next.handle(request);
+    }
 
+    const accessToken = this.authService.getAccessToken();
     if (accessToken) {
       request = this.addToken(request, accessToken);
     }
@@ -31,41 +35,39 @@ export class JwtInterceptor implements HttpInterceptor {
       catchError((error) => {
         if (error instanceof HttpErrorResponse && error.status === 401) {
           return this.handle401Error(request, next);
-        } else {
-          return throwError(() => error);
         }
+          return throwError(() => error);
       })
     );
   }
 
-  private handle401Error(request: HttpRequest<any>, next: HttpHandler) {
+  private handle401Error(request: HttpRequest<any>, next: HttpHandler): Observable<any> {
     if (!this.isRefreshing) {
       this.isRefreshing = true;
-      this.refreshTokenSubject = new BehaviorSubject<any>(null);
+      // Reset the refreshTokenSubject to null so that subsequent requests will wait
+      this.refreshTokenSubject.next(null);
 
       return this.authService.refreshToken().pipe(
         switchMap((token: any) => {
-          this.isRefreshing = false;
           this.refreshTokenSubject.next(token.accessToken);
           return next.handle(this.addToken(request, token.accessToken));
         }),
         catchError((err) => {
-          this.isRefreshing = false;
-          this.refreshTokenSubject.error(err);
-
-          // The interceptor's job is done. It failed to refresh.
-          // It should NOT handle logout. It should just propagate the error.
-          // The calling service/component will be responsible for the user-facing action.
+          // If refresh fails, logout the user
+          this.authService.clientSideLogout();
           return throwError(() => err);
+        }),
+        finalize(() => {
+          // When the refresh attempt completes, set isRefreshing to false
+          this.isRefreshing = false;
         })
       );
     } else {
+      // If a refresh is already in progress, wait for it to complete
       return this.refreshTokenSubject.pipe(
-        filter((token) => token != null),
+        filter(token => token != null),
         take(1),
-        switchMap((jwt) => {
-          return next.handle(this.addToken(request, jwt));
-        })
+        switchMap(jwt => next.handle(this.addToken(request, jwt)))
       );
     }
   }