varminer-app-header 2.6.4 → 2.6.5

package/dist/index.js

@@ -179,18 +179,19 @@ const getUserDataFromStorage = () => {
                 initials: name ? name.split(/\s+/).map((s) => s[0]).join("").slice(0, 2).toUpperCase() : undefined,
             };
         }
-        // authDetails.auth.user has firstname/lastname (lowercase n) + activeRole
+        // authDetails.auth.user has firstname/lastname (lowercase n) or firstName/lastName (camelCase) + activeRole
         const authDetailsRaw = parseNested(outer.authDetails);
         const auth = authDetailsRaw?.auth;
         const userObj = auth?.user;
-        if (auth && (userObj?.firstname || userObj?.lastname)) {
-            const first = userObj?.firstname || "";
-            const last = userObj?.lastname || "";
-            const name = [first, last].filter(Boolean).join(" ").trim();
-            const role = auth.activeRole || "";
+        const firstFromUser = (userObj?.firstname ?? userObj?.firstName ?? userObj?.given_name ?? userObj?.first_name) || "";
+        const lastFromUser = (userObj?.lastname ?? userObj?.lastName ?? userObj?.family_name ?? userObj?.last_name) || "";
+        const emailFromUser = (userObj?.email ?? userObj?.emailAddress) || (auth?.email ?? auth?.sub) || "";
+        if (auth && (firstFromUser || lastFromUser || emailFromUser)) {
+            const name = [firstFromUser, lastFromUser].filter(Boolean).join(" ").trim();
+            const role = auth.activeRole || auth.role || "";
             return {
                 name,
-                email: "",
+                email: emailFromUser,
                 role,
                 avatar: undefined,
                 initials: name ? name.split(/\s+/).map((s) => s[0]).join("").slice(0, 2).toUpperCase() : undefined,
@@ -355,49 +356,7 @@ const getAllDataFromStorage = () => {
             console.error("Error parsing header persist:", err);
         }
     }
-    // Fallback: try IAM persist key (persist:linn-i-am) then persist:userdb
-    const tryParsePersistForAuth = (raw) => {
-        if (!raw)
-            return null;
-        try {
-            const outer = JSON.parse(raw);
-            const parseNested = (v) => typeof v === "string" ? (() => { try {
-                return JSON.parse(v);
-            }
-            catch {
-                return v;
-            } })() : v;
-            for (const key of Object.keys(outer)) {
-                const parsed = parseNested(outer[key]);
-                if (parsed?.accessToken || parsed?.access_token || parsed?.token || parsed?.refreshToken)
-                    return parsed;
-                if (parsed?.auth && typeof parsed.auth === "object") {
-                    const a = parsed.auth;
-                    if (a.accessToken || a.access_token || a.token)
-                        return a;
-                }
-            }
-        }
-        catch {
-            /* ignore */
-        }
-        return null;
-    };
-    const iamPersist = localStorage.getItem("persist:linn-i-am");
-    const iamAuth = tryParsePersistForAuth(iamPersist);
-    if (iamAuth) {
-        const token = (iamAuth.accessToken ?? iamAuth.access_token ?? iamAuth.token);
-        if (token) {
-            const decodedToken = decodeJWT(token);
-            return {
-                ...emptyStorageResult(),
-                auth: iamAuth,
-                decodedToken: decodedToken ? Object.fromEntries(Object.entries(decodedToken).map(([k, v]) => [k, v ?? null])) : null,
-                rawData: iamAuth,
-            };
-        }
-    }
-    // Fallback: read access token from persist:userdb (e.g. legacy or shared auth)
+    // Fallback: read access token from persist:userdb
     const userDbString = localStorage.getItem("persist:userdb");
     if (!userDbString) {
         return emptyStorageResult();
@@ -598,7 +557,6 @@ function getTokenFromUserDbPersist(parsed) {
 function getAccessTokenForRequest() {
     const keysToTry = [
         PERSIST_HEADER_KEY,
-        "persist:linn-i-am",
         "persist:userdb",
         "token",
         "accessToken",
@@ -864,6 +822,35 @@ const AppHeader = ({ language: languageProp, accessToken: accessTokenProp, objec
         let userName = "";
         let userEmail = "";
         let userRole = "";
+        // === DEBUG ===
+        const _allLSKeys = [];
+        for (let i = 0; i < localStorage.length; i++) {
+            const k = localStorage.key(i);
+            if (k)
+                _allLSKeys.push(k);
+        }
+        const _dbgRaw = {};
+        _allLSKeys.forEach(k => {
+            const v = localStorage.getItem(k);
+            if (v) {
+                try {
+                    _dbgRaw[k] = JSON.parse(v);
+                }
+                catch {
+                    _dbgRaw[k] = v;
+                }
+            }
+            else {
+                _dbgRaw[k] = null;
+            }
+        });
+        console.warn("▶▶▶ [AppHeader DEBUG] ALL localStorage keys:", _allLSKeys);
+        console.warn("▶▶▶ [AppHeader DEBUG] ALL localStorage values:", _dbgRaw);
+        console.warn("▶▶▶ [AppHeader DEBUG] linn-i-am-userDetails:", localStorage.getItem("linn-i-am-userDetails"));
+        console.warn("▶▶▶ [AppHeader DEBUG] persist:userdb (raw):", localStorage.getItem("persist:userdb"));
+        console.warn("▶▶▶ [AppHeader DEBUG] getAllDataFromStorage():", allData);
+        console.warn("▶▶▶ [AppHeader DEBUG] getUserDataFromStorage():", getUserDataFromStorage());
+        // === END DEBUG ===
         const buildNameFromFirstLast = (obj) => {
             if (!obj || typeof obj !== "object")
                 return "";
@@ -888,8 +875,9 @@ const AppHeader = ({ language: languageProp, accessToken: accessTokenProp, objec
         }
         if (allData.auth) {
             const auth = allData.auth;
-            userEmail = userEmail || auth.email || auth.sub || "";
-            userName = userName || auth.name || buildNameFromFirstLast(auth) || "";
+            const authUser = auth.user;
+            userEmail = userEmail || auth.email || auth.sub || authUser?.email || authUser?.emailAddress || "";
+            userName = userName || auth.name || buildNameFromFirstLast(auth) || buildNameFromFirstLast(authUser) || "";
             userRole = userRole || auth.role || auth.activeRole || "";
         }
         if (allData.userDetails) {
@@ -932,13 +920,15 @@ const AppHeader = ({ language: languageProp, accessToken: accessTokenProp, objec
         const initialsVal = storedUser?.initials ??
             allData.auth?.initials ??
             allData.profile?.initials;
-        return {
+        const resolvedUser = {
             name: userName || "",
             email: userEmail || "",
             role: userRole || "",
             avatar: typeof avatarSrc === "string" ? avatarSrc : undefined,
             initials: typeof initialsVal === "string" ? initialsVal : undefined,
         };
+        console.warn("▶▶▶ [AppHeader DEBUG] Resolved user state (name/email/role):", resolvedUser);
+        return resolvedUser;
     });
     const [notificationCount, setNotificationCount] = React.useState(() => {
         const count = getNotificationCountFromStorage();
@@ -1006,8 +996,9 @@ const AppHeader = ({ language: languageProp, accessToken: accessTokenProp, objec
         }
         if (allData.auth) {
             const auth = allData.auth;
-            userEmail = userEmail || auth.email || auth.sub || "";
-            userName = userName || auth.name || buildNameFromFirstLast(auth) || "";
+            const authUser = auth.user;
+            userEmail = userEmail || auth.email || auth.sub || authUser?.email || authUser?.emailAddress || "";
+            userName = userName || auth.name || buildNameFromFirstLast(auth) || buildNameFromFirstLast(authUser) || "";
             userRole = userRole || auth.role || auth.activeRole || "";
             userAvatar = userAvatar || auth.avatar || undefined;
             userInitials = userInitials || auth.initials || undefined;
@@ -1218,7 +1209,7 @@ const AppHeader = ({ language: languageProp, accessToken: accessTokenProp, objec
             width: "100%",
             maxWidth: 360,
             pointerEvents: "none",
-        }, component: "div", "aria-hidden": "true", tabIndex: -1, children: jsxRuntime.jsxs(material.ListItem, { alignItems: "flex-start", className: "profile-menu-item", children: [jsxRuntime.jsx(material.ListItemAvatar, { children: isOnlineStatus ? (jsxRuntime.jsx(OnlineBadge, { overlap: "circular", anchorOrigin: { vertical: "bottom", horizontal: "right" }, variant: "dot", title: t.online, "aria-label": `${t.online} status badge`, "data-testid": "online-badge", children: jsxRuntime.jsx(material.Avatar, { sx: { bgcolor: colors.deepOrange[500] }, alt: user.name, title: user.name, src: user.avatar, children: getInitials() }) })) : (jsxRuntime.jsx(OfflineBadge, { overlap: "circular", anchorOrigin: { vertical: "bottom", horizontal: "right" }, variant: "dot", title: t.offline, "aria-label": `${t.offline} status badge`, "data-testid": "offline-badge", children: jsxRuntime.jsx(material.Avatar, { sx: { bgcolor: colors.deepOrange[500] }, alt: user.name, title: user.name, src: user.avatar, children: getInitials() }) })) }), jsxRuntime.jsx(material.ListItemText, { primary: jsxRuntime.jsx(material.Typography, { className: "profile-name", component: "span", children: user.name || user.email }), secondary: jsxRuntime.jsxs(React.Fragment, { children: [user.name && user.email ? (jsxRuntime.jsx(material.Typography, { className: "profile-email", component: "p", children: user.email })) : null, jsxRuntime.jsxs(material.Typography, { className: "profile-role", component: "p", children: [t.role, ": ", user.role] })] }) })] }) }));
+        }, component: "div", "aria-hidden": "true", tabIndex: -1, children: jsxRuntime.jsxs(material.ListItem, { alignItems: "flex-start", className: "profile-menu-item", children: [jsxRuntime.jsx(material.ListItemAvatar, { children: isOnlineStatus ? (jsxRuntime.jsx(OnlineBadge, { overlap: "circular", anchorOrigin: { vertical: "bottom", horizontal: "right" }, variant: "dot", title: t.online, "aria-label": `${t.online} status badge`, "data-testid": "online-badge", children: jsxRuntime.jsx(material.Avatar, { sx: { bgcolor: colors.deepOrange[500] }, alt: user.name, title: user.name, src: user.avatar, children: getInitials() }) })) : (jsxRuntime.jsx(OfflineBadge, { overlap: "circular", anchorOrigin: { vertical: "bottom", horizontal: "right" }, variant: "dot", title: t.offline, "aria-label": `${t.offline} status badge`, "data-testid": "offline-badge", children: jsxRuntime.jsx(material.Avatar, { sx: { bgcolor: colors.deepOrange[500] }, alt: user.name, title: user.name, src: user.avatar, children: getInitials() }) })) }), jsxRuntime.jsx(material.ListItemText, { primaryTypographyProps: { component: "span" }, secondaryTypographyProps: { component: "span" }, primary: jsxRuntime.jsx(material.Typography, { className: "profile-name", component: "span", children: user.name || user.email }), secondary: jsxRuntime.jsxs(React.Fragment, { children: [user.name && user.email ? (jsxRuntime.jsx(material.Typography, { className: "profile-email", component: "span", display: "block", children: user.email })) : null, jsxRuntime.jsxs(material.Typography, { className: "profile-role", component: "span", display: "block", children: [t.role, ": ", user.role] })] }) })] }) }));
     const renderMenu = (jsxRuntime.jsxs(material.Menu, { anchorEl: anchorEl, id: "account-menu", open: open, onClose: handleClose, onClick: handleClose, slotProps: {
             paper: {
                 elevation: 0,