@brggroup/share-lib 0.0.30 → 0.0.31

package/fesm2022/brggroup-share-lib.mjs

@@ -5,7 +5,7 @@ import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import * as i3 from '@ngx-translate/core';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
-import { firstValueFrom, BehaviorSubject, of, catchError, EMPTY, throwError, finalize, filter, fromEvent } from 'rxjs';
+import { firstValueFrom, BehaviorSubject, of, catchError, throwError, finalize, from, switchMap as switchMap$1, EMPTY, filter, take, fromEvent } from 'rxjs';
 import { NzNotificationService } from 'ng-zorro-antd/notification';
 import * as i1 from 'ng-zorro-antd/modal';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -419,7 +419,14 @@ class TokenStorage {
     static saveToken(tokenRes) {
         AppStorage.tokenStorage.setItem(this.JWT_TOKEN, tokenRes.Data.Token);
         AppStorage.tokenStorage.setItem(this.JWT_RFT_TOKEN, tokenRes.Data.RefreshToken);
-        const userInfo = jwtDecode(tokenRes.Data.Token);
+        TokenStorage.saveTokenInfo(tokenRes.Data.Token);
+    }
+    static saveTokenRft(token) {
+        AppStorage.tokenStorage.setItem(this.JWT_TOKEN, token);
+        TokenStorage.saveTokenInfo(token);
+    }
+    static saveTokenInfo(token) {
+        const userInfo = jwtDecode(token);
         AppStorage.tokenStorage.setItem(this.USER_NAME, userInfo[this.USER_NAME]);
         AppStorage.tokenStorage.setItem(this.FULL_NAME, userInfo[this.FULL_NAME]);
         AppStorage.tokenStorage.setItem(this.ORG_ID, userInfo[this.ORG_ID]);
@@ -479,6 +486,21 @@ class AuthService extends HTTPService {
     commonService = inject(CommonService);
     router = inject(Router);
     translate = inject(TranslateService);
+    async refreshToken() {
+        const refreshToken = TokenStorage.getRftToken();
+        if (!refreshToken)
+            return null;
+        const body = { rft: refreshToken };
+        try {
+            const result = (await firstValueFrom(this.httpClient.post(AppGlobals.apiEndpoint + '/api/Auth/RefreshToken', body)));
+            if (result?.IsSuccess) {
+                TokenStorage.saveTokenRft(result.Data);
+                return result;
+            }
+        }
+        catch { }
+        return null;
+    }
     async pingAuth() {
         try {
             const res = await this.post(AppGlobals.apiEndpoint + URLs.pingAuth);
@@ -621,23 +643,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.7", ngImpor
         }] });
 
 let initialReturnUrl = null;
+let isRefreshing = false;
+const refreshTokenSubject = new BehaviorSubject(null);
 function authInterceptor(req, next) {
     const router = inject(Router);
     const loadingService = inject(LoadingService);
-    const modalService = inject(NzModalService);
-    const notiService = inject(NotiService);
-    const translate = inject(TranslateService);
+    const authService = inject(AuthService);
     const authToken = TokenStorage.getToken();
     const noLoadingMark = req.headers.get('No-Loading-Mark');
-    if (noLoadingMark != '1') {
+    if (noLoadingMark !== '1')
         loadingService.loadingUp();
-    }
+    // Convert dates
     if (!(req.body instanceof FormData)) {
         const newBody = convertDatesInBody(req.body);
         if (req.body !== newBody) {
             req = req.clone({ body: newBody });
         }
     }
+    // Add token
     if (authToken) {
         req = req.clone({
             setHeaders: { Authorization: `Bearer ${authToken}` },
@@ -645,8 +668,46 @@ function authInterceptor(req, next) {
     }
     return next(req).pipe(catchError((error) => {
         if (error.status === 401) {
-            modalService.closeAll();
-            notiService.error(translate.instant('EXPIRED_TOKEN'));
+            return handle401(req, next, router, authService);
+        }
+        return throwError(() => error);
+    }), finalize(() => {
+        if (noLoadingMark !== '1')
+            loadingService.loadingDown();
+    }));
+}
+//
+// ⭐ REFRESH TOKEN HANDLER
+//
+function handle401(req, next, router, authService) {
+    if (!isRefreshing) {
+        isRefreshing = true;
+        refreshTokenSubject.next(null);
+        return from(authService.refreshToken()).pipe(switchMap$1((resAny) => {
+            const res = resAny;
+            isRefreshing = false;
+            if (!res?.IsSuccess) {
+                TokenStorage.clearToken();
+                const currentUrl = router.routerState.snapshot.url;
+                if (!initialReturnUrl && !currentUrl.startsWith('/login')) {
+                    initialReturnUrl = currentUrl;
+                }
+                router.navigate(['/login'], {
+                    queryParams: { returnUrl: initialReturnUrl || '/' },
+                });
+                return EMPTY;
+            }
+            // Lưu token mới
+            TokenStorage.saveToken(res);
+            // Phát token mới cho các request đang chờ
+            refreshTokenSubject.next(TokenStorage.getToken());
+            // Retry request
+            return next(req.clone({
+                setHeaders: { Authorization: `Bearer ${TokenStorage.getToken()}` },
+            }));
+        }), catchError((err) => {
+            isRefreshing = false;
+            TokenStorage.clearToken();
             const currentUrl = router.routerState.snapshot.url;
             if (!initialReturnUrl && !currentUrl.startsWith('/login')) {
                 initialReturnUrl = currentUrl;
@@ -654,14 +715,15 @@ function authInterceptor(req, next) {
             router.navigate(['/login'], {
                 queryParams: { returnUrl: initialReturnUrl || '/' },
             });
-            return EMPTY;
-        }
-        return throwError(() => error);
-    }), finalize(() => {
-        if (noLoadingMark != '1') {
-            loadingService.loadingDown();
-        }
-    }));
+            return throwError(() => err);
+        }));
+    }
+    else {
+        // Nếu đang refresh → chờ token mới rồi retry
+        return refreshTokenSubject.pipe(filter((token) => token != null), take(1), switchMap$1((token) => next(req.clone({
+            setHeaders: { Authorization: `Bearer ${token}` },
+        }))));
+    }
 }
 function convertDatesInBody(obj) {
     if (obj instanceof Date) {