@bnsights/bbsf-admin-portal 1.2.11 → 1.2.13

package/README.md

@@ -4,6 +4,23 @@ BBSF Admin Portal package is part of BBSF 3 packages. It hosts all the angular m
 
 For more info please visit [BBSF documentation](https://bnsightsprojects.visualstudio.com/BBSF%203/_wiki/wikis/BBSF-3.wiki/65/BBSF-Documentation)
 
+
+## 1.2.13 / 24-03-2026
+
+=====================
+
+- Update controls package to 1.2.13
+
+## 1.2.12 / 04-02-2026
+
+=====================
+
+- Update controls package to 1.2.12
+- Update Utilities package to 1.2.6
+- Improved authentication guard to wait for token refresh completion
+- Fixed login page initialization when user is already authenticated
+- Enhanced error handling for unauthorized requests
+
 ## 1.2.11 / 20-01-2026
 
 =====================
@@ -11,7 +28,6 @@ For more info please visit [BBSF documentation](https://bnsightsprojects.visuals
 - Update controls package to 1.2.11
 - Update Utilities package to 1.2.5
 
-
 ## 1.2.10 / 05-01-2026
 
 =====================

package/fesm2022/bnsights-bbsf-admin-portal.mjs

@@ -11,7 +11,7 @@ import { RequestOptionsModel, AuthService, EnvironmentService, UtilityService, B
 import { __decorate } from 'tslib';
 import * as i1$2 from 'ng-block-ui';
 import { BlockUI, BlockUIModule } from 'ng-block-ui';
-import { BehaviorSubject, throwError, of } from 'rxjs';
+import { BehaviorSubject, Observable, throwError, of } from 'rxjs';
 import * as objectPath from 'object-path';
 import { createPopper } from '@popperjs/core';
 import * as i11 from 'ng-inline-svg-2';
@@ -3409,7 +3409,35 @@ class AuthGuard {
         this.homeURL = "";
     }
     canActivate(route, state) {
-        if (this.authService.isAuthenticated()) {
+        // Check if refresh is in progress
+        const refreshLockKey = 'auth_refreshing_lock';
+        const lockValue = localStorage.getItem(refreshLockKey);
+        const isRefreshing = !!lockValue && Date.now() - parseInt(lockValue) < 5000;
+        if (isRefreshing) {
+            // Wait for refresh to complete by polling the lock
+            return new Observable(observer => {
+                const checkInterval = setInterval(() => {
+                    const currentLock = localStorage.getItem(refreshLockKey);
+                    const stillRefreshing = currentLock && Date.now() - parseInt(currentLock) < 5000;
+                    if (!stillRefreshing) {
+                        clearInterval(checkInterval);
+                        observer.next(this.evaluateAuth(route, state));
+                        observer.complete();
+                    }
+                }, 100); // Check every 100ms
+                // Timeout after 10 seconds
+                setTimeout(() => {
+                    clearInterval(checkInterval);
+                    observer.next(this.evaluateAuth(route, state));
+                    observer.complete();
+                }, 10000);
+            });
+        }
+        return this.evaluateAuth(route, state);
+    }
+    evaluateAuth(route, state) {
+        const isAuth = this.authService.isAuthenticated();
+        if (isAuth) {
             let currentSelectedPermissionSetID = Number.parseInt(AuthService.user.profile["selectedpermissionsetid"]);
             let excludedUrls = ['Admin/Home'];
             let isExcludedUrl = excludedUrls.some(url => state.url.toLocaleLowerCase().includes(url.toLocaleLowerCase()));
@@ -23057,6 +23085,12 @@ class LoginComponent {
         };
     }
     ngOnInit() {
+        // Check if user is already authenticated BEFORE doing anything
+        // This prevents login form initialization from conflicting with post-refresh navigation
+        if (this.authService.isAuthenticated()) {
+            this.router.navigate([this.authService.getUrl()]);
+            return; // Don't initialize login form
+        }
         let body = document.getElementsByTagName("body")[0];
         if (body) {
             body.removeAttribute("class");
@@ -23731,12 +23765,10 @@ class HttpErrorInterceptor {
                 // server-side error
                 errorMessage = `Error Code: ${error.status}\nMessage: ${error.message}`;
                 if (error.status == 401) {
-                    // window.sessionStorage.clear()
-                    //auth.logout();
-                    //window.location.href = '/login'
-                    // //console.log(error.message);
+                    // Clear auth state before redirect
+                    const authService = this.injector.get(AuthService);
+                    authService.clearLocalAuthState({ keepRedirectUrl: true });
                     this.zone.run(() => router.navigate(["/Admin/account/login"]));
-                    //return notificationService.error(`${error.statusText}`, false, null, 5000);
                 }
                 else if (error.status == 516) {
                     this.zone.run(() => router.navigate([`/Admin/account/error/${error.status}/${error.error}`]));