@propmix/profet-common-header 3.2.0-beta → 3.2.0

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

@@ -405,7 +405,7 @@ class HeaderComponent {
         this._snackbar = inject(MatSnackBar);
         this._headerSer = inject(CommonHeaderService);
         this._domSanitizer = inject(DomSanitizer);
-        this.INACTIVITY_LIMIT = 120000; // 2 minutes
+        this.INACTIVITY_LIMIT = 30 * 60 * 1000; // 30 minutes
         this.logoutEvent = new EventEmitter();
         this.companyControl = new FormControl();
         this.appConfig = AppConfig.appConfig;
@@ -522,11 +522,19 @@ class HeaderComponent {
         // Poll for the logout signal cookie (works across ports/subdomains)
         this.logoutCheckInterval = setInterval(() => {
             if (this.getCookie('session_expired')) {
-                this.handleLogout(false);
+                // 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.getCookie('lastActiveSessionTime');
+                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
     }
-    handleLogout(broadcast = true, showPopup = true) {
+    handleLogout(broadcast = true, showPopup = true, isManual = false) {
         // Prevent multiple popups if already open
         // if (this._headerSer.isSessionExpiryDialogOpen && showPopup) {
         //   return;
@@ -536,9 +544,13 @@ class HeaderComponent {
             this.setCookie('session_expired', 'true', 1);
         }
         this.logoutEvent.emit();
-        let appUrl = this._headerSer.headerConfig.signOutUrl;
-        let separator = appUrl.includes('?') ? '&' : '?';
-        let sessionUrl = appUrl + separator + 'sessionExpired=true&timeout=' + this.INACTIVITY_LIMIT;
+        let sessionUrl = this._headerSer.headerConfig.signOutUrl;
+        // Only add sessionExpired params if it is NOT a manual logout
+        if (!isManual) {
+            let appUrl = this._headerSer.headerConfig.signOutUrl;
+            let separator = appUrl.includes('?') ? '&' : '?';
+            sessionUrl = appUrl + separator + 'sessionExpired=true&timeout=' + this.INACTIVITY_LIMIT;
+        }
         signOut({ global: true, oauth: { redirectUrl: sessionUrl } })
             .then(() => {
             window.open(sessionUrl, '_self');