varminer-app-header 2.1.8 → 2.2.0

package/dist/index.js

@@ -376,32 +376,17 @@ const getAllDataFromStorage = () => {
     }
 };
 /**
- * Get profile picture URL from object store API using tenant_id and user_id from JWT token
+ * Get profile picture URL from object store API using user_id.
  * @param baseUrl - Base URL for the object store API (default: http://objectstore.impact0mics.local:9012)
- * @returns Profile picture URL or null if tenant_id or user_id is not available
+ * @returns Profile picture URL or null if user_id is not available
  */
 const getProfilePictureUrl = (baseUrl = "http://objectstore.impact0mics.local:9012") => {
     try {
         const allData = getAllDataFromStorage();
-        // Get tenant_id and user_id from decoded token
-        let tenantId = null;
-        let userId = null;
-        if (allData.decodedToken) {
-            tenantId = allData.decodedToken.tenant_id || allData.decodedToken.tenant || null;
-            userId = allData.decodedToken.user_id || null;
-        }
-        // If not found in decoded token, try auth data
-        if ((!tenantId || !userId) && allData.auth) {
-            tenantId = tenantId || allData.auth.tenant_id || allData.auth.tenant || null;
-            userId = userId || allData.auth.user_id || null;
-        }
-        // Construct URL if we have both tenant_id and user_id
-        if (tenantId && userId) {
-            // Remove trailing slash from baseUrl if present
-            const cleanBaseUrl = baseUrl.replace(/\/$/, '');
-            return `${cleanBaseUrl}/v1/objectStore/profilePicture/path/${tenantId}/${userId}`;
-        }
-        return null;
+        const userId = allData.decodedToken?.user_id ?? allData.auth?.user_id ?? getStoredUserDetails()?.userId ?? null;
+        if (userId == null)
+            return null;
+        return `${baseUrl.replace(/\/$/, "")}/v1/objectStore/profilePicture/path/${userId}`;
     }
     catch (err) {
         console.error("Error getting profile picture URL:", err);
@@ -723,51 +708,68 @@ const AppHeader = ({ language: languageProp }) => {
     const [mobileMoreAnchorEl, setMobileMoreAnchorEl] = React.useState(null);
     const [user, setUser] = React.useState(() => {
         const allData = getAllDataFromStorage();
-        // Try to get user data from various sources
         let userName = "";
         let userEmail = "";
         let userRole = "";
-        // Priority 1: From decoded token
-        if (allData.decodedToken) {
-            userName = allData.decodedToken.sub || allData.decodedToken.email || "";
-            userEmail = allData.decodedToken.sub || allData.decodedToken.email || "";
-            userRole = allData.decodedToken.role || "";
-        }
-        // Priority 2: From auth data
-        if (allData.auth) {
-            userName = userName || allData.auth.name || allData.auth.email || "";
-            userEmail = userEmail || allData.auth.email || allData.auth.sub || "";
-            userRole = userRole || allData.auth.role || allData.auth.activeRole || "";
-        }
-        // Priority 3: From userDetails/user/profile
+        const buildNameFromFirstLast = (obj) => {
+            if (!obj || typeof obj !== "object")
+                return "";
+            const first = (obj.firstName ?? obj.given_name ?? obj.first_name);
+            const last = (obj.lastName ?? obj.family_name ?? obj.last_name);
+            return [first, last].filter(Boolean).join(" ").trim();
+        };
+        // Prefer getUserDataFromStorage first (IAM firstName+lastName or persist:userdb name)
         const storedUser = getUserDataFromStorage();
         if (storedUser) {
-            userName = userName || storedUser.name || "";
+            userName = storedUser.name || "";
             userEmail = userEmail || storedUser.email || "";
             userRole = userRole || storedUser.role || "";
         }
-        // Priority 4: From other parsed data
+        // Then enrich from decoded token (email from sub; name only if token has name/given_name/family_name, never use sub as name)
+        if (allData.decodedToken) {
+            const token = allData.decodedToken;
+            userEmail = userEmail || token.sub || token.email || "";
+            const tokenName = token.name || buildNameFromFirstLast(token);
+            userName = userName || (tokenName || "");
+            userRole = userRole || token.role || "";
+        }
+        if (allData.auth) {
+            const auth = allData.auth;
+            userEmail = userEmail || auth.email || auth.sub || "";
+            userName = userName || auth.name || buildNameFromFirstLast(auth) || "";
+            userRole = userRole || auth.role || auth.activeRole || "";
+        }
         if (allData.userDetails) {
-            const userDetails = allData.userDetails.user || allData.userDetails.data || allData.userDetails;
-            if (userDetails) {
-                userName = userName || userDetails.name || userDetails.fullName || "";
-                userEmail = userEmail || userDetails.email || userDetails.emailAddress || "";
-                userRole = userRole || userDetails.role || userDetails.userRole || "";
+            const userDetails = allData.userDetails.user
+                || allData.userDetails.data
+                || allData.userDetails;
+            const details = userDetails;
+            if (details) {
+                userEmail = userEmail || details.email || details.emailAddress || "";
+                userName = userName || details.name || details.fullName || buildNameFromFirstLast(details) || "";
+                userRole = userRole || details.role || details.userRole || "";
             }
         }
         if (allData.user) {
-            const userData = allData.user.user || allData.user.data || allData.user.currentUser || allData.user;
+            const u = allData.user.user
+                || allData.user.data
+                || allData.user.currentUser
+                || allData.user;
+            const userData = u;
             if (userData) {
-                userName = userName || userData.name || userData.fullName || "";
                 userEmail = userEmail || userData.email || userData.emailAddress || "";
+                userName = userName || userData.name || userData.fullName || buildNameFromFirstLast(userData) || "";
                 userRole = userRole || userData.role || userData.userRole || "";
             }
         }
         if (allData.profile) {
-            const profileData = allData.profile.user || allData.profile.data || allData.profile;
+            const p = allData.profile.user
+                || allData.profile.data
+                || allData.profile;
+            const profileData = p;
             if (profileData) {
-                userName = userName || profileData.name || profileData.fullName || "";
                 userEmail = userEmail || profileData.email || profileData.emailAddress || "";
+                userName = userName || profileData.name || profileData.fullName || buildNameFromFirstLast(profileData) || "";
                 userRole = userRole || profileData.role || profileData.userRole || "";
             }
         }
@@ -816,67 +818,81 @@ const AppHeader = ({ language: languageProp }) => {
     }, []); // Only run once on mount - fetch when component loads
     React.useEffect(() => {
         const allData = getAllDataFromStorage();
-        // Try to get user data from various sources
         let userName = "";
         let userEmail = "";
         let userRole = "";
-        let userAvatar = undefined;
-        let userInitials = undefined;
-        // Priority 1: From decoded token
-        if (allData.decodedToken) {
-            userName = allData.decodedToken.sub || allData.decodedToken.email || "";
-            userEmail = allData.decodedToken.sub || allData.decodedToken.email || "";
-            userRole = allData.decodedToken.role || "";
-        }
-        // Priority 2: From auth data
-        if (allData.auth) {
-            userName = userName || allData.auth.name || allData.auth.email || "";
-            userEmail = userEmail || allData.auth.email || allData.auth.sub || "";
-            userRole = userRole || allData.auth.role || allData.auth.activeRole || "";
-            userAvatar = userAvatar || allData.auth.avatar || undefined;
-            userInitials = userInitials || allData.auth.initials || undefined;
-        }
-        // Priority 3: From userDetails/user/profile
+        let userAvatar;
+        let userInitials;
+        const buildNameFromFirstLast = (obj) => {
+            if (!obj || typeof obj !== "object")
+                return "";
+            const first = (obj.firstName ?? obj.given_name ?? obj.first_name);
+            const last = (obj.lastName ?? obj.family_name ?? obj.last_name);
+            return [first, last].filter(Boolean).join(" ").trim();
+        };
         const storedUser = getUserDataFromStorage();
         if (storedUser) {
-            userName = userName || storedUser.name || "";
+            userName = storedUser.name || "";
             userEmail = userEmail || storedUser.email || "";
             userRole = userRole || storedUser.role || "";
-            userAvatar = userAvatar || storedUser.avatar || undefined;
-            userInitials = userInitials || storedUser.initials || undefined;
+            userAvatar = storedUser.avatar;
+            userInitials = storedUser.initials;
+        }
+        if (allData.decodedToken) {
+            const token = allData.decodedToken;
+            userEmail = userEmail || token.sub || token.email || "";
+            const tokenName = token.name || buildNameFromFirstLast(token);
+            userName = userName || (tokenName || "");
+            userRole = userRole || token.role || "";
+        }
+        if (allData.auth) {
+            const auth = allData.auth;
+            userEmail = userEmail || auth.email || auth.sub || "";
+            userName = userName || auth.name || buildNameFromFirstLast(auth) || "";
+            userRole = userRole || auth.role || auth.activeRole || "";
+            userAvatar = userAvatar || auth.avatar || undefined;
+            userInitials = userInitials || auth.initials || undefined;
         }
-        // Priority 4: From other parsed data
         if (allData.userDetails) {
-            const userDetails = allData.userDetails.user || allData.userDetails.data || allData.userDetails;
-            if (userDetails) {
-                userName = userName || userDetails.name || userDetails.fullName || "";
-                userEmail = userEmail || userDetails.email || userDetails.emailAddress || "";
-                userRole = userRole || userDetails.role || userDetails.userRole || "";
-                userAvatar = userAvatar || userDetails.avatar || userDetails.profilePicture || undefined;
-                userInitials = userInitials || userDetails.initials || undefined;
+            const userDetails = allData.userDetails.user
+                || allData.userDetails.data
+                || allData.userDetails;
+            const details = userDetails;
+            if (details) {
+                userEmail = userEmail || details.email || details.emailAddress || "";
+                userName = userName || details.name || details.fullName || buildNameFromFirstLast(details) || "";
+                userRole = userRole || details.role || details.userRole || "";
+                userAvatar = userAvatar || details.avatar || details.profilePicture || undefined;
+                userInitials = userInitials || details.initials || undefined;
             }
         }
         if (allData.user) {
-            const userData = allData.user.user || allData.user.data || allData.user.currentUser || allData.user;
+            const u = allData.user.user
+                || allData.user.data
+                || allData.user.currentUser
+                || allData.user;
+            const userData = u;
             if (userData) {
-                userName = userName || userData.name || userData.fullName || "";
                 userEmail = userEmail || userData.email || userData.emailAddress || "";
+                userName = userName || userData.name || userData.fullName || buildNameFromFirstLast(userData) || "";
                 userRole = userRole || userData.role || userData.userRole || "";
                 userAvatar = userAvatar || userData.avatar || userData.profilePicture || undefined;
                 userInitials = userInitials || userData.initials || undefined;
             }
         }
         if (allData.profile) {
-            const profileData = allData.profile.user || allData.profile.data || allData.profile;
+            const p = allData.profile.user
+                || allData.profile.data
+                || allData.profile;
+            const profileData = p;
             if (profileData) {
-                userName = userName || profileData.name || profileData.fullName || "";
                 userEmail = userEmail || profileData.email || profileData.emailAddress || "";
+                userName = userName || profileData.name || profileData.fullName || buildNameFromFirstLast(profileData) || "";
                 userRole = userRole || profileData.role || profileData.userRole || "";
                 userAvatar = userAvatar || profileData.avatar || profileData.profilePicture || undefined;
                 userInitials = userInitials || profileData.initials || undefined;
             }
         }
-        // Use fetched blob URL if available, otherwise fall back to other sources
         setUser({
             name: userName || "",
             email: userEmail || "",