@brggroup/share-lib 0.0.30 → 0.0.32

package/fesm2022/brggroup-share-lib.mjs

@@ -1,11 +1,11 @@
 import * as i0 from '@angular/core';
-import { inject, Injectable, Component, HostListener, ViewContainerRef, Input, ViewChild, EventEmitter, Output, Directive, Optional, Self, HostBinding, forwardRef, Pipe } from '@angular/core';
+import { inject, Injectable, NgZone, Component, HostListener, ViewContainerRef, Input, ViewChild, EventEmitter, Output, Directive, Optional, Self, HostBinding, forwardRef, Pipe } from '@angular/core';
 import * as i1$3 from '@angular/router';
 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]);
@@ -470,6 +477,7 @@ class TokenStorage {
 
 const URLs = {
     login: '/api/Auth/Login',
+    register: '/api/Auth/Register',
     pingAuth: '/api/Auth/PingAuth',
     changePassword: '/api/Auth/ChangePassword',
     setPass: '/api/Auth/SetPass',
@@ -477,11 +485,32 @@ const URLs = {
 class AuthService extends HTTPService {
     notiService = inject(NotiService);
     commonService = inject(CommonService);
+    ngZone = inject(NgZone);
     router = inject(Router);
     translate = inject(TranslateService);
+    async refreshToken() {
+        const refreshToken = TokenStorage.getRftToken();
+        if (!refreshToken)
+            return null;
+        const body = { rft: refreshToken };
+        try {
+            const res = await this.sendRftToken(body);
+            if (res?.IsSuccess) {
+                TokenStorage.saveTokenRft(res.Data);
+                return res;
+            }
+            else {
+                return null;
+            }
+        }
+        catch (err) {
+            console.log(err);
+        }
+        return null;
+    }
     async pingAuth() {
         try {
-            const res = await this.post(AppGlobals.apiEndpoint + URLs.pingAuth);
+            const res = await this.get(AppGlobals.apiEndpoint + URLs.pingAuth, true);
             return res?.IsSuccess;
         }
         catch {
@@ -502,6 +531,7 @@ class AuthService extends HTTPService {
             }
             this.notiService.success('Đăng nhập thành công');
             TokenStorage.saveToken(res);
+            this.startWatching();
             if (returnUrl) {
                 this.router.navigateByUrl(returnUrl);
             }
@@ -517,9 +547,18 @@ class AuthService extends HTTPService {
             headers: new HttpHeaders().set('Content-Type', 'application/json'),
         }));
     }
+    async sendRftToken(body) {
+        return firstValueFrom(this.httpClient.post(AppGlobals.apiEndpoint + '/api/Auth/RefreshToken', body, {
+            headers: new HttpHeaders().set('Content-Type', 'application/json'),
+        }));
+    }
     signOut() {
         TokenStorage.clearToken();
-        this.router.navigate(['/login']);
+        this.stopWatching();
+        const currentUrl = this.router.routerState.snapshot.url;
+        this.router.navigate(['/login'], {
+            queryParams: { returnUrl: currentUrl || '/' },
+        });
     }
     getUserMenu() {
         let data = {
@@ -546,6 +585,51 @@ class AuthService extends HTTPService {
     setPass(data) {
         return this.postData(AppGlobals.apiEndpoint + URLs.setPass, data);
     }
+    async signUp(d) {
+        try {
+            const res = await this.sendSignUp(d);
+            if (!res.IsSuccess) {
+                this.notiService.error(res.ErrorMessage);
+                return;
+            }
+            this.notiService.success('Đăng ký thành công');
+            this.router.navigateByUrl('/login');
+        }
+        catch (err) {
+            console.log(err);
+            this.notiService.handleError(err);
+        }
+    }
+    async sendSignUp(d) {
+        return this.postData(AppGlobals.apiEndpoint + URLs.register, d);
+    }
+    idleTimer;
+    idleTimeInMinutes = 15; // phút
+    idleTime = this.idleTimeInMinutes * 60 * 1000;
+    startWatching() {
+        console.log(`-- start watching idle (${this.idleTimeInMinutes} ${this.idleTimeInMinutes == 1 ? 'min' : 'mins'}) --`);
+        this.resetTimer();
+        window.addEventListener('mousemove', () => this.resetTimer());
+        window.addEventListener('keydown', () => this.resetTimer());
+        window.addEventListener('click', () => this.resetTimer());
+    }
+    resetTimer() {
+        if (this.idleTimer) {
+            clearTimeout(this.idleTimer);
+        }
+        this.ngZone.runOutsideAngular(() => {
+            this.idleTimer = setTimeout(() => {
+                this.ngZone.run(() => {
+                    console.log('-- idle logout --');
+                    this.signOut(); // auto logout
+                });
+            }, this.idleTime);
+        });
+    }
+    stopWatching() {
+        console.log('-- stop watching idle --');
+        clearTimeout(this.idleTimer);
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.7", ngImport: i0, type: AuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.7", ngImport: i0, type: AuthService, providedIn: 'root' });
 }
@@ -621,23 +705,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 +730,44 @@ 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) {
+                const currentUrl = router.routerState.snapshot.url;
+                if (!initialReturnUrl && !currentUrl.startsWith('/login')) {
+                    initialReturnUrl = currentUrl;
+                }
+                router.navigate(['/login'], {
+                    queryParams: { returnUrl: initialReturnUrl || '/' },
+                });
+                refreshTokenSubject.next(null);
+                return EMPTY;
+            }
+            // 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 +775,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) {