@brggroup/share-lib 0.1.0 → 0.1.1

package/fesm2022/brggroup-share-lib.mjs

@@ -4,7 +4,7 @@ import * as i1$4 from '@angular/router';
 import { Router, ActivatedRoute, NavigationEnd, RouterLink, RouterOutlet } 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 { TranslateService, TranslatePipe, TranslateModule } from '@ngx-translate/core';
 import { firstValueFrom, fromEvent, startWith, map, BehaviorSubject, of, catchError, throwError, finalize, from, switchMap as switchMap$1, take, filter, Subject, takeUntil as takeUntil$1 } from 'rxjs';
 import { NzNotificationService } from 'ng-zorro-antd/notification';
 import * as i1 from 'ng-zorro-antd/modal';
@@ -803,6 +803,7 @@ function authInterceptor(req, next) {
     const router = inject(Router);
     const loadingService = inject(LoadingService);
     const authService = inject(AuthService);
+    const translate = inject(TranslatePipe);
     const authToken = TokenStorage.getToken();
     const noLoadingMark = req.headers.get('No-Loading-Mark');
     if (noLoadingMark !== '1')
@@ -822,7 +823,7 @@ function authInterceptor(req, next) {
     }
     return next(req).pipe(catchError((error) => {
         if (error.status === 401) {
-            return handle401(req, next, router, authService);
+            return handle401(req, next, router, authService, translate);
         }
         return throwError(() => error);
     }), finalize(() => {
@@ -833,7 +834,7 @@ function authInterceptor(req, next) {
 //
 // ⭐ REFRESH TOKEN HANDLER
 //
-function handle401(req, next, router, authService) {
+function handle401(req, next, router, authService, translate) {
     if (!isRefreshing) {
         isRefreshing = true;
         refreshTokenSubject.next(null);
@@ -848,8 +849,8 @@ function handle401(req, next, router, authService) {
                 router.navigate(['/login'], {
                     queryParams: { returnUrl: initialReturnUrl || '/' },
                 });
-                refreshTokenSubject.error('Refresh token failed');
-                return throwError(() => new Error('Refresh token failed'));
+                refreshTokenSubject.error(translate.transform('Refresh token failed'));
+                return throwError(() => new Error(translate.transform('Refresh token failed')));
             }
             // Phát token mới cho các request đang chờ
             refreshTokenSubject.next(TokenStorage.getToken());
@@ -1187,6 +1188,7 @@ class BaseComponent {
     translate = inject(TranslateService);
     modal = inject(CustomModalService);
     routeSub;
+    backURL = '';
     /**
      * Khi dùng onRouteChange nhớ dùng unSubRouteChange
      */
@@ -1201,7 +1203,12 @@ class BaseComponent {
         this.routeSub?.unsubscribe();
     }
     goback() {
-        this.location.back();
+        if (this.backURL) {
+            this.goto(this.backURL);
+        }
+        else {
+            this.location.back();
+        }
     }
     goto(url) {
         if (url) {