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

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

@@ -218,6 +218,8 @@ class Utilities {
 class CommonHeaderService {
     constructor(config) {
         this.config = config;
+        this.SESSION_EXPIRED_KEY = 'session_expired';
+        this.LAST_ACTIVE_SESSION_KEY = 'lastActiveSessionTime';
         this.baseUrl = '';
         this.isSessionExpiryDialogOpen = false;
         this._apiGatewayService = inject(ApiGatewayService);
@@ -311,6 +313,63 @@ class CommonHeaderService {
         let url = `${this.baseUrl + EndPoints.API_URLS.updateLastAccessedApplication}`;
         return this._apiGatewayService.doPost(url, reqBody);
     }
+    /**
+     * Helper to get the root domain (e.g. .profet.ai) to share cookies across subdomains/ports.
+     * If on localhost or an IP, it falls back to the hostname.
+     */
+    getRootDomain() {
+        const hostname = window.location.hostname;
+        const parts = hostname.split('.');
+        if (parts.length > 2 && !/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(hostname)) {
+            // If we have 4+ parts (e.g. app1.local.profet.ai), we want to include the environment (local.profet.ai)
+            // to avoid sharing cookies with app1.dev.profet.ai or app1.profet.ai.
+            if (parts.length > 3) {
+                return '.' + parts.slice(-3).join('.');
+            }
+            // For standard 3 parts (app1.profet.ai), share on .profet.ai
+            return '.' + parts.slice(-2).join('.');
+        }
+        return hostname;
+    }
+    /**
+     * Generates a unique cookie name based on the environment root domain.
+     * e.g. 'lastActive' on .qa.profet.ai -> 'lastActive_qa_profet_ai'
+     * @param name Base cookie name
+     */
+    getSuffixedCookieName(name) {
+        const rootDomain = this.getRootDomain();
+        // Replace dots with underscores to create a clean suffix
+        const suffix = rootDomain.replace(/\./g, '_');
+        return `${name}${suffix}`;
+    }
+    setCookie(name, value, days) {
+        const uniqueName = this.getSuffixedCookieName(name);
+        let expires = "";
+        if (days) {
+            const date = new Date();
+            date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+            expires = "; expires=" + date.toUTCString();
+        }
+        // Important: set domain to allow sharing across subdomains
+        const domain = "; domain=" + this.getRootDomain();
+        document.cookie = uniqueName + "=" + (value || "") + expires + domain + "; path=/";
+    }
+    getCookie(name) {
+        const uniqueName = this.getSuffixedCookieName(name);
+        const nameEQ = uniqueName + "=";
+        const ca = document.cookie.split(';');
+        for (let i = 0; i < ca.length; i++) {
+            let c = ca[i];
+            while (c.charAt(0) == ' ')
+                c = c.substring(1, c.length);
+            if (c.indexOf(nameEQ) == 0)
+                return c.substring(nameEQ.length, c.length);
+        }
+        return null;
+    }
+    deleteCookie(name) {
+        this.setCookie(name, '', -1);
+    }
 }
 CommonHeaderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CommonHeaderService, deps: [{ token: 'headerConfig' }], target: i0.ɵɵFactoryTarget.Injectable });
 CommonHeaderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CommonHeaderService, providedIn: 'root' });
@@ -445,74 +504,20 @@ class HeaderComponent {
         // }
         this.resetTimer();
         // Clear any stale logout signal on init
-        this.setCookie('session_expired', '', -1);
+        this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, '', -1);
         this.startLogoutCheck();
     }
-    /**
-     * Helper to get the root domain (e.g. .mycom.ai) to share cookies across subdomains/ports.
-     * If on localhost or an IP, it falls back to the hostname.
-     */
-    getRootDomain() {
-        const hostname = window.location.hostname;
-        const parts = hostname.split('.');
-        if (parts.length > 2 && !/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(hostname)) {
-            // If we have 4+ parts (e.g. app1.local.profet.ai), we want to include the environment (local.profet.ai)
-            // to avoid sharing cookies with app1.dev.profet.ai or app1.profet.ai.
-            if (parts.length > 3) {
-                return '.' + parts.slice(-3).join('.');
-            }
-            // For standard 3 parts (app1.profet.ai), share on .profet.ai
-            return '.' + parts.slice(-2).join('.');
-        }
-        return hostname;
-    }
-    /**
-     * Generates a unique cookie name based on the environment root domain.
-     * e.g. 'lastActive' on .qa.profet.ai -> 'lastActive_qa_profet_ai'
-     * @param name Base cookie name
-     */
-    getSuffixedCookieName(name) {
-        const rootDomain = this.getRootDomain();
-        // Replace dots with underscores to create a clean suffix
-        const suffix = rootDomain.replace(/\./g, '_');
-        return `${name}${suffix}`;
-    }
-    setCookie(name, value, days) {
-        const uniqueName = this.getSuffixedCookieName(name);
-        let expires = "";
-        if (days) {
-            const date = new Date();
-            date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
-            expires = "; expires=" + date.toUTCString();
-        }
-        // Important: set domain to allow sharing across subdomains
-        const domain = "; domain=" + this.getRootDomain();
-        document.cookie = uniqueName + "=" + (value || "") + expires + domain + "; path=/";
-    }
-    getCookie(name) {
-        const uniqueName = this.getSuffixedCookieName(name);
-        const nameEQ = uniqueName + "=";
-        const ca = document.cookie.split(';');
-        for (let i = 0; i < ca.length; i++) {
-            let c = ca[i];
-            while (c.charAt(0) == ' ')
-                c = c.substring(1, c.length);
-            if (c.indexOf(nameEQ) == 0)
-                return c.substring(nameEQ.length, c.length);
-        }
-        return null;
-    }
     resetTimer(isUserActivity = true) {
         clearTimeout(this.inactivityTimeout);
         // Update global activity timestamp in cookie ONLY if triggered by user activity
         if (isUserActivity) {
             // Use a short expiry (e.g. 1 day) or sync with session length
-            this.setCookie('lastActiveSessionTime', Date.now().toString(), 1);
+            this._headerSer.setCookie(this._headerSer.LAST_ACTIVE_SESSION_KEY, Date.now().toString(), 1);
         }
         // if (!this._headerSer.isSessionExpiryDialogOpen) {
         this.inactivityTimeout = setTimeout(() => {
             // Check global activity before logging out
-            const lastActive = this.getCookie('lastActiveSessionTime');
+            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;
@@ -534,11 +539,11 @@ class HeaderComponent {
     startLogoutCheck() {
         // Poll for the logout signal cookie (works across ports/subdomains)
         this.logoutCheckInterval = setInterval(() => {
-            if (this.getCookie('session_expired')) {
+            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.getCookie('lastActiveSessionTime');
+                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;
@@ -554,15 +559,18 @@ class HeaderComponent {
         // }
         if (broadcast) {
             // Set a cookie to signal other tabs/ports
-            this.setCookie('session_expired', 'true', 1);
+            this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, 'true', 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);
+        }
         // 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;
+            const separator = sessionUrl.includes('?') ? '&' : '?';
+            sessionUrl = sessionUrl + separator + 'sessionExpired=true&timeout=' + this.INACTIVITY_LIMIT;
         }
         signOut({ global: true, oauth: { redirectUrl: sessionUrl } })
             .then(() => {
@@ -672,22 +680,27 @@ class HeaderComponent {
     onLogoutClick() {
         this.menuTrigger.closeMenu();
         // Sync with other tabs
-        this.setCookie('session_expired', 'true', 1);
+        this._headerSer.setCookie(this._headerSer.SESSION_EXPIRED_KEY, 'true', 1);
         // Clear timers
         if (this.inactivityTimeout)
             clearTimeout(this.inactivityTimeout);
         if (this.logoutCheckInterval)
             clearInterval(this.logoutCheckInterval);
         this.logoutEvent.emit();
-        signOut({ global: true, oauth: { redirectUrl: this._headerSer.headerConfig.signOutUrl } })
+        let sessionUrl = this._headerSer.headerConfig.signOutUrl;
+        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(this._headerSer.headerConfig.signOutUrl, '_self');
+            window.open(sessionUrl, '_self');
         })
             .catch((err) => {
             console.log(err);
-            signOut({ global: true, oauth: { redirectUrl: this._headerSer.headerConfig.signOutUrl } })
+            signOut({ global: true, oauth: { redirectUrl: sessionUrl } })
                 .then(() => {
-                window.open(this._headerSer.headerConfig.signOutUrl, '_self');
+                window.open(sessionUrl, '_self');
             })
                 .catch((error) => console.log(error));
         });