@propmix/profet-common-header 3.2.0-beta.2 → 3.2.0-beta.4

package/fesm2020/propmix-profet-common-header.mjs

@@ -464,6 +464,8 @@ class HeaderComponent {
         this._snackbar = inject(MatSnackBar);
         this._headerSer = inject(CommonHeaderService);
         this._domSanitizer = inject(DomSanitizer);
+        this.componentInitTime = 0;
+        this.lastProcessedLogoutTimestamp = 0;
         this.INACTIVITY_LIMIT = 30 * 60 * 1000; // 30 minutes
         this.logoutEvent = new EventEmitter();
         this.companyControl = new FormControl();
@@ -502,9 +504,15 @@ class HeaderComponent {
         //     },
         //   });
         // }
-        this.resetTimer();
-        // Clear any stale logout signal on init
-        this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, '', -1);
+        // Capture when this component/app was loaded
+        this.componentInitTime = Date.now();
+        // Remove legacy boolean check or reset if needed, but primarily we rely on timestamps now.
+        // We do NOT want to clear the cookie immediately on init if it's a valid persistent signal, 
+        // but the timestamp check guards against "looping" on reload.
+        // However, if we want to support "fresh login means fresh session", we might just ignore old timestamps (which we do via > initTime check).
+        // So distinct cleanup isn't strictly necessary if the login page no longer deletes it. 
+        // But let's leave it as is or remove it. The user's issue was "delete cookie" logic on LOGIN PAGE caused race condition.
+        // Here we just want to start monitoring.
         this.startLogoutCheck();
     }
     resetTimer(isUserActivity = true) {
@@ -539,16 +547,26 @@ class HeaderComponent {
     startLogoutCheck() {
         // Poll for the logout signal cookie (works across ports/subdomains)
         this.logoutCheckInterval = setInterval(() => {
-            if (this._headerSer.getCookie(this._headerSer.SESSION_EXPIRED_KEY)) {
-                // Check if tab still "active" according to the shared time
-                // If tab is active but receiving a logout signal, it implies a MANUAL logout from another tab.
-                // If tab is inactive and receiving a logout signal, it implies a TIMEOUT.
-                const lastActive = this._headerSer.getCookie(this._headerSer.LAST_ACTIVE_SESSION_KEY);
-                const now = Date.now();
-                const lastActiveTime = lastActive ? parseInt(lastActive, 10) : 0;
-                const elapsed = now - lastActiveTime;
-                const isManual = elapsed < this.INACTIVITY_LIMIT;
-                this.handleLogout(false, false, isManual);
+            const logoutCookie = this._headerSer.getCookie(this._headerSer.SESSION_EXPIRED_KEY);
+            if (logoutCookie) {
+                const logoutTimestamp = parseInt(logoutCookie, 10);
+                // 1. Check if it's a valid number (legacy 'true' string support is irrelevant if we fully switch, but safe to check NaN)
+                if (!isNaN(logoutTimestamp)) {
+                    // 2. Check if this logout event happened AFTER this app was initialized
+                    //    This prevents infinite loops if the user just logged in and the cookie is still there.
+                    if (logoutTimestamp > this.componentInitTime) {
+                        // 3. Check if we haven't already processed this exact logout event
+                        if (logoutTimestamp > this.lastProcessedLogoutTimestamp) {
+                            this.lastProcessedLogoutTimestamp = logoutTimestamp;
+                            const lastActive = this._headerSer.getCookie(this._headerSer.LAST_ACTIVE_SESSION_KEY);
+                            const now = Date.now();
+                            const lastActiveTime = lastActive ? parseInt(lastActive, 10) : 0;
+                            const elapsed = now - lastActiveTime;
+                            const isManual = elapsed < this.INACTIVITY_LIMIT;
+                            this.handleLogout(false, false, isManual);
+                        }
+                    }
+                }
             }
         }, 2000); // Check every 2 seconds
     }
@@ -558,14 +576,17 @@ class HeaderComponent {
         //   return;
         // }
         if (broadcast) {
-            // Set a cookie to signal other tabs/ports
-            this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, 'true', 1);
+            // Set a cookie to signal other tabs/ports with the current TIMESTAMP
+            // This timestamp allows other tabs to know if this is a "new" logout event relative to their session start.
+            const now = Date.now();
+            this.lastProcessedLogoutTimestamp = now; // Don't logout myself again based on this
+            this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, now.toString(), 1);
         }
         this.logoutEvent.emit();
         let sessionUrl = this._headerSer.headerConfig.signOutUrl;
         if (this._headerSer.headerConfig.enableLastUrlRedirection) {
             const separator = sessionUrl.includes('?') ? '&' : '?';
-            sessionUrl = sessionUrl + separator + 'returnUrl=' + encodeURIComponent(window.location.href);
+            sessionUrl = sessionUrl + separator + 'redirectUrl=' + encodeURIComponent(window.location.href);
         }
         // Only add sessionExpired params if it is NOT a manual logout
         if (!isManual) {
@@ -680,7 +701,9 @@ class HeaderComponent {
     onLogoutClick() {
         this.menuTrigger.closeMenu();
         // Sync with other tabs
-        this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, 'true', 1);
+        const now = Date.now();
+        this.lastProcessedLogoutTimestamp = now;
+        this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, now.toString(), 1);
         // Clear timers
         if (this.inactivityTimeout)
             clearTimeout(this.inactivityTimeout);
@@ -688,10 +711,10 @@ class HeaderComponent {
             clearInterval(this.logoutCheckInterval);
         this.logoutEvent.emit();
         let sessionUrl = this._headerSer.headerConfig.signOutUrl;
-        if (this._headerSer.headerConfig.enableLastUrlRedirection) {
-            const separator = sessionUrl.includes('?') ? '&' : '?';
-            sessionUrl = sessionUrl + separator + 'returnUrl=' + encodeURIComponent(window.location.href);
-        }
+        // if (this._headerSer.headerConfig.enableLastUrlRedirection) {
+        //   const separator = sessionUrl.includes('?') ? '&' : '?';
+        //   sessionUrl = sessionUrl + separator + 'returnUrl=' + encodeURIComponent(window.location.href);
+        // }
         signOut({ global: true, oauth: { redirectUrl: sessionUrl } })
             .then((data) => {
             window.open(sessionUrl, '_self');