Restore original proven localStorage scan + add Bearer token API fallback + retry

static/addon.html

@@ -343,216 +343,65 @@
     }
 
     // ── User Integration & History ──────────────────────────────────────────
-
-    // ── Name Discovery Engine ───────────────────────────────────────────────
-    function _extractNameFromObj(obj, depth) {
-        if (!obj || typeof obj !== 'object' || depth > 3) return null;
-        // Direct field paths (covers virtually every HR/auth framework)
-        const directPaths = [
-            'name', 'fullName', 'full_name', 'displayName', 'display_name',
-            'userName', 'username', 'user_name',
-            'firstName', 'first_name', 'lastname', 'lastName', 'last_name',
-            'empName', 'emp_name', 'employeeName', 'employee_name',
-        ];
-        for (const key of directPaths) {
-            if (typeof obj[key] === 'string' && obj[key].trim().length > 1) {
-                return obj[key].trim();
-            }
-        }
-        // Composite: firstName + lastName
-        const fn = obj.firstName || obj.first_name || obj.fname || '';
-        const ln = obj.lastName || obj.last_name || obj.lname || '';
-        if (fn && ln) return `${fn} ${ln}`.trim();
-        if (fn) return fn.trim();
-
-        // Nested objects — recurse into common wrapper keys
-        const nestedKeys = [
-            'user', 'data', 'profile', 'personalDetails', 'personal_details',
-            'employee', 'emp', 'info', 'userInfo', 'userData', 'userProfile',
-            'account', 'auth', 'session', 'result', 'payload', 'attributes',
-            'claims', 'identity',
-        ];
-        for (const nk of nestedKeys) {
-            if (obj[nk] && typeof obj[nk] === 'object') {
-                const found = _extractNameFromObj(obj[nk], depth + 1);
-                if (found) return found;
-            }
-        }
-        return null;
-    }
-
-    function _decodeJWT(token) {
+    async function initUserSession() {
+        // 1. Discover User Name from localStorage/sessionStorage (PROVEN - was working)
+        let userName = null;
         try {
-            const parts = token.split('.');
-            if (parts.length !== 3) return null;
-            const payload = JSON.parse(atob(parts[1].replace(/-/g, '+').replace(/_/g, '/')));
-            return _extractNameFromObj(payload, 0);
-        } catch (e) { return null; }
-    }
-
-    function _discoverFromStorage() {
-        const stores = [localStorage, sessionStorage];
-        for (const store of stores) {
-            try {
-                for (let i = 0; i < store.length; i++) {
-                    const key = store.key(i);
-                    if (key.startsWith('martech_')) continue;
-                    const val = store.getItem(key);
-                    if (!val) continue;
-
+            const storageKeys = ['userInfo', 'user', 'profile', 'auth', 'currentUser', 'account'];
+            for (const key of storageKeys) {
+                const stored = localStorage.getItem(key) || sessionStorage.getItem(key);
+                if (stored) {
                     try {
-                        const parsed = JSON.parse(val);
-                        if (typeof parsed === 'object' && parsed !== null) {
-                            const found = _extractNameFromObj(parsed, 0);
-                            if (found) return found;
+                        const parsed = JSON.parse(stored);
+                        userName = parsed.name || parsed.fullName || (parsed.user && parsed.user.name) || parsed.display_name;
+                        if (userName) break;
+                    } catch(err) {
+                        if (typeof stored === 'string' && stored.length < 50 && !stored.includes('{')) {
+                            userName = stored; break;
                         }
-                    } catch (e) {}
-
-                    if (val.split('.').length === 3 && val.length > 30) {
-                        const jwtName = _decodeJWT(val);
-                        if (jwtName) return jwtName;
-                    }
-
-                    if (typeof val === 'string' && val.length > 1 && val.length < 60
-                        && !val.includes('{') && !val.includes('http') && !val.includes('=')
-                        && /^[A-Za-z\s.\-']+$/.test(val)
-                        && (key.toLowerCase().includes('name') || key.toLowerCase().includes('user'))) {
-                        return val.trim();
-                    }
-                }
-            } catch (e) {}
-        }
-
-        // JWT tokens from cookies
-        try {
-            const cookies = document.cookie.split(';');
-            for (const c of cookies) {
-                const val = c.split('=').slice(1).join('=').trim();
-                if (val.split('.').length === 3 && val.length > 30) {
-                    const jwtName = _decodeJWT(val);
-                    if (jwtName) return jwtName;
-                }
-            }
-        } catch (e) {}
-
-        // DOM elements
-        try {
-            const selectors = [
-                '.user-name', '.username', '.user-display-name', '.profile-name',
-                '#user-name', '#username', '#userName', '#profileName',
-                '[data-user-name]', '[data-username]',
-                '.navbar .name', '.header .name', '.topbar .name',
-                '.user-info .name', '.user-profile .name',
-            ];
-            for (const sel of selectors) {
-                const el = document.querySelector(sel);
-                if (el) {
-                    const text = (el.textContent || el.getAttribute('data-user-name') || '').trim();
-                    if (text.length > 1 && text.length < 60 && /^[A-Za-z\s.\-']+$/.test(text)) {
-                        return text;
                     }
                 }
             }
         } catch (e) {}
 
-        return null;
-    }
-
-    function _findAuthToken() {
-        const tokenKeys = [
-            'token', 'accessToken', 'access_token', 'authToken', 'auth_token',
-            'jwt', 'jwtToken', 'jwt_token', 'bearer', 'bearerToken',
-            'id_token', 'idToken', 'userToken', 'user_token', 'session_token',
-            'x-auth-token', 'Authorization',
-        ];
-        const stores = [localStorage, sessionStorage];
-        for (const store of stores) {
+        // 2. If localStorage didn't have it, try the profile API with Bearer token
+        if (!userName) {
             try {
-                // Check common token key names first
-                for (const key of tokenKeys) {
-                    const val = store.getItem(key);
-                    if (val && val.length > 20) return val.replace(/^Bearer\s+/i, '');
-                }
-                // Brute-scan: any value that looks like a JWT
-                for (let i = 0; i < store.length; i++) {
-                    const key = store.key(i);
-                    if (key.startsWith('martech_')) continue;
-                    const val = store.getItem(key);
-                    if (val && val.split('.').length === 3 && val.length > 50 && !val.includes(' ')) {
-                        return val;
-                    }
+                // Find auth token from localStorage
+                const tokenKeys = ['token', 'accessToken', 'access_token', 'authToken', 'auth_token', 'jwt', 'jwtToken'];
+                let authToken = null;
+                for (const tk of tokenKeys) {
+                    const tv = localStorage.getItem(tk) || sessionStorage.getItem(tk);
+                    if (tv && tv.length > 20) { authToken = tv.replace(/^Bearer\s+/i, ''); break; }
                 }
-            } catch (e) {}
-        }
-        return null;
-    }
 
-    async function _tryResolveName() {
-        const authToken = _findAuthToken();
+                const headers = {};
+                if (authToken) headers['Authorization'] = 'Bearer ' + authToken;
 
-        // 1. PRIMARY: Fetch from the HR portal profile API with Bearer token
-        if (authToken) {
-            try {
                 const pResp = await fetch("https://hrmmartechsol-ba71e8dc3fa2.herokuapp.com/api/users/profile", {
-                    headers: { 'Authorization': 'Bearer ' + authToken },
+                    headers: headers,
                     credentials: 'include'
                 });
                 if (pResp.ok) {
                     const pData = await pResp.json();
-                    const n = pData.name || _extractNameFromObj(pData, 0);
-                    if (n) return n;
+                    userName = pData.name || (pData.personalDetails && pData.personalDetails.fullName);
                 }
             } catch (e) {}
         }
 
-        // 2. Try without token (cookie-based fallback)
-        try {
-            const pResp = await fetch("https://hrmmartechsol-ba71e8dc3fa2.herokuapp.com/api/users/profile", {
-                credentials: 'include'
-            });
-            if (pResp.ok) {
-                const pData = await pResp.json();
-                const n = pData.name || _extractNameFromObj(pData, 0);
-                if (n) return n;
-            }
-        } catch (e) {}
-
-        // 3. FALLBACK: Deep-scan localStorage, sessionStorage, cookies, DOM
-        return _discoverFromStorage();
-    }
-
-    async function _syncNameWithBackend(name) {
+        // 3. Multi-user logic: if name changed, clear old session and start fresh
         const lastKnownName = localStorage.getItem('martech_last_user_name');
-        if (name && lastKnownName && name !== lastKnownName) {
+        if (userName && lastKnownName && userName !== lastKnownName) {
             localStorage.removeItem('martech_session_id');
             sessionId = 'user-' + Date.now() + '-' + Math.random().toString(36).slice(2, 9);
             localStorage.setItem('martech_session_id', sessionId);
             messagesContainer.innerHTML = '<div class="chat-message bot">Welcome! How can I help you today?</div>';
         }
-        if (name) {
-            localStorage.setItem('martech_last_user_name', name);
-        }
-        await fetch(BASE_URL + "/api/session/update-name", {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ session_id: sessionId, user_name: name })
-        }).then(r => r.json()).then(rData => {
-            if (rData.new_session_id && rData.new_session_id !== sessionId) {
-                sessionId = rData.new_session_id;
-                localStorage.setItem('martech_session_id', sessionId);
-            }
-        }).catch(() => {});
-    }
-
-    async function initUserSession() {
-        let userName = await _tryResolveName();
-
-        // If name found, sync immediately
         if (userName) {
-            await _syncNameWithBackend(userName);
+            localStorage.setItem('martech_last_user_name', userName);
         }
 
-        // Fetch history for this session
+        // 4. Fetch history for this session
         try {
             const hResp = await fetch(BASE_URL + "/api/session/history/" + sessionId);
             if (hResp.ok) {
@@ -567,17 +416,78 @@
             }
         } catch (e) {}
 
-        // If name NOT found, keep retrying in the background (every 5s, up to 1 min)
+        // 5. Sync name with backend
+        if (userName) {
+            await fetch(BASE_URL + "/api/session/update-name", {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ session_id: sessionId, user_name: userName })
+            }).then(r => r.json()).then(rData => {
+                if (rData.new_session_id && rData.new_session_id !== sessionId) {
+                    sessionId = rData.new_session_id;
+                    localStorage.setItem('martech_session_id', sessionId);
+                }
+            }).catch(() => {});
+        }
+
+        // 6. If name NOT found, keep retrying in the background (every 5s, up to 1 min)
         if (!userName) {
             let retries = 0;
-            const maxRetries = 12;
             const retryInterval = setInterval(async () => {
                 retries++;
-                const resolved = await _tryResolveName();
+                let resolved = null;
+
+                // Re-check localStorage
+                try {
+                    const storageKeys = ['userInfo', 'user', 'profile', 'auth', 'currentUser', 'account'];
+                    for (const key of storageKeys) {
+                        const stored = localStorage.getItem(key) || sessionStorage.getItem(key);
+                        if (stored) {
+                            try {
+                                const parsed = JSON.parse(stored);
+                                resolved = parsed.name || parsed.fullName || (parsed.user && parsed.user.name) || parsed.display_name;
+                                if (resolved) break;
+                            } catch(err) {}
+                        }
+                    }
+                } catch (e) {}
+
+                // Re-try profile API
+                if (!resolved) {
+                    try {
+                        const tokenKeys = ['token', 'accessToken', 'access_token', 'authToken', 'auth_token', 'jwt', 'jwtToken'];
+                        let authToken = null;
+                        for (const tk of tokenKeys) {
+                            const tv = localStorage.getItem(tk) || sessionStorage.getItem(tk);
+                            if (tv && tv.length > 20) { authToken = tv.replace(/^Bearer\s+/i, ''); break; }
+                        }
+                        const headers = {};
+                        if (authToken) headers['Authorization'] = 'Bearer ' + authToken;
+                        const pResp = await fetch("https://hrmmartechsol-ba71e8dc3fa2.herokuapp.com/api/users/profile", {
+                            headers: headers,
+                            credentials: 'include'
+                        });
+                        if (pResp.ok) {
+                            const pData = await pResp.json();
+                            resolved = pData.name || (pData.personalDetails && pData.personalDetails.fullName);
+                        }
+                    } catch (e) {}
+                }
+
                 if (resolved) {
                     clearInterval(retryInterval);
-                    await _syncNameWithBackend(resolved);
-                } else if (retries >= maxRetries) {
+                    localStorage.setItem('martech_last_user_name', resolved);
+                    await fetch(BASE_URL + "/api/session/update-name", {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({ session_id: sessionId, user_name: resolved })
+                    }).then(r => r.json()).then(rData => {
+                        if (rData.new_session_id && rData.new_session_id !== sessionId) {
+                            sessionId = rData.new_session_id;
+                            localStorage.setItem('martech_session_id', sessionId);
+                        }
+                    }).catch(() => {});
+                } else if (retries >= 12) {
                     clearInterval(retryInterval);
                 }
             }, 5000);