varminer-app-header 2.2.1 → 2.2.2

package/dist/index.js

@@ -77,77 +77,38 @@ function getStoredUserDetails() {
         return null;
     }
 }
-const getUserDataFromStorage = () => {
-    // Prefer IAM user details when available (same origin, after verify-OTP)
-    const iamUser = getStoredUserDetails();
-    if (iamUser) {
-        const name = [iamUser.firstName, iamUser.lastName].filter(Boolean).join(" ").trim();
-        const role = iamUser.roles?.length ? iamUser.roles[0] : iamUser.workInfo?.jobTitle ?? "";
-        return {
-            name: name || "",
-            email: iamUser.email || "",
-            role: role || "",
-            avatar: undefined,
-            initials: name ? name.split(/\s+/).map((s) => s[0]).join("").slice(0, 2).toUpperCase() : undefined,
-        };
+// --- Header-owned persist store (unique key, no conflict with other apps) ---
+/** Unique localStorage key for this header package. Used only for access token; user details come from IAM (linn-i-am-userDetails). */
+const PERSIST_HEADER_KEY = "persist:varminer-app-header";
+/**
+ * Store auth (e.g. accessToken) in the header's own persist key. Call this after login so the header can use the token for profile picture etc.
+ * User details are not stored here; they come from IAM (linn-i-am-userDetails).
+ */
+function setHeaderAuth(auth) {
+    try {
+        const payload = auth ? { auth } : {};
+        localStorage.setItem(PERSIST_HEADER_KEY, JSON.stringify(payload));
     }
-    const userDbString = localStorage.getItem("persist:userdb");
-    if (userDbString) {
-        try {
-            const parsedOuter = JSON.parse(userDbString);
-            const parseNested = (value) => {
-                if (typeof value === 'string') {
-                    try {
-                        return JSON.parse(value);
-                    }
-                    catch {
-                        return value;
-                    }
-                }
-                return value;
-            };
-            let userData = null;
-            if (parsedOuter.userDetails) {
-                const parsedUserDetails = parseNested(parsedOuter.userDetails);
-                userData = parsedUserDetails.user || parsedUserDetails.data || parsedUserDetails;
-            }
-            if (!userData && parsedOuter.user) {
-                const parsedUser = parseNested(parsedOuter.user);
-                userData = parsedUser.user || parsedUser.data || parsedUser.currentUser || parsedUser;
-            }
-            if (!userData && parsedOuter.authDetails) {
-                const parsedAuthDetails = parseNested(parsedOuter.authDetails);
-                if (parsedAuthDetails.auth) {
-                    userData = parsedAuthDetails.auth.user || parsedAuthDetails.auth.userData;
-                }
-                if (!userData) {
-                    userData = parsedAuthDetails.user || parsedAuthDetails.userData || parsedAuthDetails.currentUser;
-                }
-            }
-            if (!userData && parsedOuter.profile) {
-                const parsedProfile = parseNested(parsedOuter.profile);
-                userData = parsedProfile.user || parsedProfile.data || parsedProfile;
-            }
-            if (userData) {
-                let name = userData.name || userData.fullName || userData.userName || "";
-                if (!name && (userData.firstName || userData.lastName)) {
-                    name = [userData.firstName, userData.lastName].filter(Boolean).join(' ');
-                }
-                return {
-                    name: name || "",
-                    email: userData.email || userData.emailAddress || "",
-                    role: userData.role || userData.userRole || userData.designation || userData.title || "",
-                    avatar: userData.avatar || userData.profilePicture || userData.imageUrl || userData.profileImage,
-                    initials: userData.initials,
-                };
-            }
-        }
-        catch (err) {
-            console.error("Error parsing user data from localStorage:", err);
-            return null;
-        }
+    catch (err) {
+        console.error("Error setting header auth:", err);
     }
-    return null;
+}
+/**
+ * User display data: from IAM only (linn-i-am-userDetails). No dependency on persist:userdb.
+ */
+const getUserDataFromStorage = () => {
+    const iamUser = getStoredUserDetails();
+    if (!iamUser)
+        return null;
+    const name = [iamUser.firstName, iamUser.lastName].filter(Boolean).join(" ").trim();
+    const role = iamUser.roles?.length ? iamUser.roles[0] : iamUser.workInfo?.jobTitle ?? "";
+    return {
+        name: name || "",
+        email: iamUser.email || "",
+        role: role || "",
+        avatar: undefined,
+        initials: name ? name.split(/\s+/).map((s) => s[0]).join("").slice(0, 2).toUpperCase() : undefined,
+    };
 };
 const getNotificationCountFromStorage = () => {
     const userDbString = localStorage.getItem("persist:userdb");
@@ -263,26 +224,49 @@ const decodeJWT = (token) => {
         return null;
     }
 };
+const emptyStorageResult = () => ({
+    auth: null,
+    user: null,
+    authDetails: null,
+    userDetails: null,
+    profile: null,
+    notifications: null,
+    messages: null,
+    app: null,
+    decodedToken: null,
+    rawData: null,
+});
 /**
- * Get all data from localStorage (persist:userdb) including decoded accessToken
- * This function reads all available data without hardcoding and doesn't require any parameters
- * @returns Comprehensive object containing all available data from localStorage and decoded JWT payload
+ * Get auth (and decoded token) for header use. Reads from header's own persist key first; falls back to persist:userdb only for access token.
+ * User details are not read from userdb—use getStoredUserDetails / getUserDataFromStorage (IAM) for that.
+ * @returns Object with auth, decodedToken, and other keys (user/userDetails/profile null when using header key)
  */
 const getAllDataFromStorage = () => {
+    // Prefer header-owned persist key (unique, no conflict with other apps)
+    const headerStr = localStorage.getItem(PERSIST_HEADER_KEY);
+    if (headerStr) {
+        try {
+            const parsed = JSON.parse(headerStr);
+            const auth = parsed?.auth;
+            const accessToken = auth?.accessToken;
+            if (accessToken) {
+                const decodedToken = decodeJWT(accessToken);
+                return {
+                    ...emptyStorageResult(),
+                    auth: auth,
+                    decodedToken: decodedToken ? Object.fromEntries(Object.entries(decodedToken).map(([k, v]) => [k, v ?? null])) : null,
+                    rawData: parsed,
+                };
+            }
+        }
+        catch (err) {
+            console.error("Error parsing header persist:", err);
+        }
+    }
+    // Fallback: read access token from persist:userdb (e.g. legacy or shared auth)
     const userDbString = localStorage.getItem("persist:userdb");
     if (!userDbString) {
-        return {
-            auth: null,
-            user: null,
-            authDetails: null,
-            userDetails: null,
-            profile: null,
-            notifications: null,
-            messages: null,
-            app: null,
-            decodedToken: null,
-            rawData: null,
-        };
+        return emptyStorageResult();
     }
     try {
         const parsedOuter = JSON.parse(userDbString);
@@ -360,19 +344,7 @@ const getAllDataFromStorage = () => {
     }
     catch (err) {
         console.error("Error parsing all data from localStorage:", err);
-        return {
-            auth: null,
-            user: null,
-            authDetails: null,
-            userDetails: null,
-            profile: null,
-            notifications: null,
-            messages: null,
-            app: null,
-            decodedToken: null,
-            rawData: null,
-            error: err instanceof Error ? err.message : 'Unknown error',
-        };
+        return { ...emptyStorageResult(), error: err instanceof Error ? err.message : "Unknown error" };
     }
 };
 /**
@@ -393,43 +365,6 @@ const getProfilePictureUrl = (baseUrl = "http://objectstore.impact0mics.local:90
         return null;
     }
 };
-/**
- * Get profile picture upload URL for the object store API.
- * URL format: {baseUrl}/v1/objectStore/profilePictureUpload?tenantId=&userId=&roleId=
- * @param baseUrl - Base URL for the object store API (default: http://objectstore.impact0mics.local:9012)
- * @returns Full upload URL with query params, or null if tenantId, userId, or roleId is missing
- */
-const getProfilePictureUploadUrl = (baseUrl = "http://objectstore.impact0mics.local:9012") => {
-    try {
-        const allData = getAllDataFromStorage();
-        const iamUser = getStoredUserDetails();
-        const tenantId = allData.decodedToken?.tenant_id ??
-            allData.decodedToken?.tenant ??
-            allData.auth?.tenant_id ??
-            allData.auth?.tenant ??
-            null;
-        const userId = allData.decodedToken?.user_id ??
-            allData.auth?.user_id ??
-            iamUser?.userId ??
-            null;
-        const roleId = allData.decodedToken?.role_id ??
-            allData.auth?.role_id ??
-            null;
-        if (tenantId == null || userId == null || roleId == null)
-            return null;
-        const cleanBaseUrl = baseUrl.replace(/\/$/, "");
-        const params = new URLSearchParams({
-            tenantId: String(tenantId),
-            userId: String(userId),
-            roleId: String(roleId),
-        });
-        return `${cleanBaseUrl}/v1/objectStore/profilePictureUpload?${params.toString()}`;
-    }
-    catch (err) {
-        console.error("Error getting profile picture upload URL:", err);
-        return null;
-    }
-};
 /**
  * Generate AWS S3 presigned URL for accessing S3 object
  * @param s3Url - Full S3 URL (e.g., https://bucket.s3.region.amazonaws.com/key)
@@ -551,13 +486,19 @@ const fetchProfilePictureAsBlobUrl = async (baseUrl = "http://objectstore.impact
         // Generate message ID and correlation ID if not provided
         const msgId = messageId || `msg-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         const corrId = correlationId || `corr-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+        const allData = getAllDataFromStorage();
+        const accessToken = allData.auth?.accessToken;
+        const headers = {
+            'X-Message-Id': msgId,
+            'X-Correlation-Id': corrId,
+        };
+        if (accessToken) {
+            headers['Authorization'] = `Bearer ${accessToken}`;
+        }
         // Step 1: Fetch the profile picture path from API (returns JSON with filePath)
         const apiResponse = await fetch(profilePictureUrl, {
             method: 'GET',
-            headers: {
-                'X-Message-Id': msgId,
-                'X-Correlation-Id': corrId,
-            },
+            headers,
         });
         // Check if the API response is successful
         if (!apiResponse.ok) {
@@ -1186,17 +1127,18 @@ const AppHeader = ({ language: languageProp }) => {
 
 exports.AppHeader = AppHeader;
 exports.DrawerProvider = DrawerProvider;
+exports.PERSIST_HEADER_KEY = PERSIST_HEADER_KEY;
 exports.USER_DETAILS_STORAGE_KEY = USER_DETAILS_STORAGE_KEY;
 exports.fetchProfilePictureAsBlobUrl = fetchProfilePictureAsBlobUrl;
 exports.getAllDataFromStorage = getAllDataFromStorage;
 exports.getI18nLocaleFromStorage = getI18nLocaleFromStorage;
 exports.getMessageCountFromStorage = getMessageCountFromStorage;
 exports.getNotificationCountFromStorage = getNotificationCountFromStorage;
-exports.getProfilePictureUploadUrl = getProfilePictureUploadUrl;
 exports.getProfilePictureUrl = getProfilePictureUrl;
 exports.getStoredUserDetails = getStoredUserDetails;
 exports.getTranslations = getTranslations;
 exports.getUserDataFromStorage = getUserDataFromStorage;
+exports.setHeaderAuth = setHeaderAuth;
 exports.setI18nLocaleToStorage = setI18nLocaleToStorage;
 exports.translations = translations;
 exports.useDrawer = useDrawer;