UPDATE แก้ http-request.interceptor.ts

src/app/authentication/login-page/login-page2.component.html

@@ -78,7 +78,7 @@
                           role="alert">
                           กรุณาตรวจสอบชื่อสมาชิกและรหัสผ่าน
                         </div>
-                        <button type="submit" (click)="Submit()"
+                        <button type="submit" 
                           class="py-2 px-3 inline-flex justify-center items-center gap-2 rounded-sm border border-transparent font-semibold bg-primary text-white hover:bg-primary focus:outline-none focus:ring-0 focus:ring-primary focus:ring-offset-0 transition-all text-sm dark:focus:ring-offset-white/10">เข้าสู่ระบบ</button>
                         <!-- <div class="text-center">
                           <p class="mt-3 text-sm text-gray-600 dark:text-white/70">

src/app/shared/services/auth.service.ts

@@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
 import { AngularFireAuth } from '@angular/fire/compat/auth';
 import { Router } from '@angular/router';
 import { BehaviorSubject, catchError, filter, Observable, switchMap, tap, throwError } from 'rxjs';
+import { TokenService } from './token.service';
 
 @Injectable({
   providedIn: 'root',
@@ -11,13 +12,18 @@ export class AuthService {
   authState: any;
   apiBaseUrl = "/auth";
 
-  constructor(private router: Router, private http: HttpClient) {
+  constructor(private router: Router, private http: HttpClient, private tokenService: TokenService) {
   }
 
   refreshToken(token: string) {
     return this.http.post<any>(this.apiBaseUrl + "/refresh-token", {
       "refreshToken": token
-    });
+    }).pipe(
+      tap(response => {
+        this.tokenService.saveToken(response.accessToken);
+        this.tokenService.saveRefreshToken(response.refreshToken);
+      })
+    );
   }
 
   get isUserAnonymousLoggedIn(): boolean {

src/app/shared/services/http-request.interceptor.ts

@@ -14,7 +14,7 @@ import { TokenService } from './token.service';
 const TOKEN_HEADER_KEY = 'Authorization';
 @Injectable()
 export class HttpRequestInterceptor {
-  private isRefreshing = false;
+  private isRefreshing = true;
   private refreshTokenSubject: BehaviorSubject<any> = new BehaviorSubject<any>(null);
   constructor(private tokenService: TokenService, private authService: AuthService) { }
 
@@ -36,29 +36,30 @@ export class HttpRequestInterceptor {
       return next.handle(authReq).pipe(catchError(error => {
         if (fullUrl.includes("login")) {
           return next.handle(this.addTokenHeader(req, "Bearer ", fullUrl))
-        } else if (error instanceof HttpErrorResponse && (error.status === 401 || error.status === 403) && !fullUrl.includes("login")) {
-          return this.handle403Error(authReq, next, fullUrl);
+        } else if (error instanceof HttpErrorResponse && error.status === 401 && !fullUrl.includes("login")) {
+          if(fullUrl.includes("/refresh-token")&& error.status === 401){
+            this.tokenService.signOut();
+          }else{
+            this.isRefreshing = false;
+            return this.handle401Error(authReq, next, fullUrl);
+          }
         }
         return throwError(error);
       }));
     }
   }
 
-  private handle403Error(request: HttpRequest<any>, next: HttpHandler, fullUrl: string) {
+  private handle401Error(request: HttpRequest<any>, next: HttpHandler, fullUrl: string) {
     if (!this.isRefreshing) {
-      this.isRefreshing = true;
       this.refreshTokenSubject.next(null);
-
       const token = this.tokenService.getRefreshToken();
 
       if (token) {
         return this.authService.refreshToken(token.replace("Bearer ", "")).pipe(
           switchMap((token: any) => {
-            this.isRefreshing = false;
-            this.tokenService.saveToken(token.accessToken);
-            this.tokenService.saveRefreshToken(token.refreshToken);
+            this.isRefreshing = true;
+            console.log("🚀 2222222222222222222222222222222222222",   this.isRefreshing)
             this.refreshTokenSubject.next(token.accessToken);
-
             return next.handle(this.addTokenHeader(request, "Bearer " + token.accessToken, fullUrl));
           }),
           catchError((err) => {

src/app/shared/services/token.service.ts

@@ -51,7 +51,7 @@ export class TokenService {
     window.localStorage.clear();
     localStorage.clear();
     sessionStorage.clear()
-    this.router.navigate(["/auth/splash"]);
+    this.router.navigate(['/auth/login']);
   }
 
   public saveToken(token: string): void {