varminer-app-header 2.2.3 → 2.2.5

package/dist/index.js

@@ -421,17 +421,161 @@ function getAccessTokenFromAuth(auth) {
         auth.token;
     return typeof token === "string" && token.length > 0 ? token : undefined;
 }
-const fetchProfilePictureAsBlobUrl = async (baseUrl = "http://objectstore.impact0mics.local:9012") => {
+/** True if string looks like a JWT (three base64 parts) or a bearer token, not JSON. */
+function looksLikeToken(s) {
+    return s.length > 0 && !s.trimStart().startsWith("{") && !s.trimStart().startsWith("[");
+}
+/** Recursively find first string value at keys accessToken, access_token, or token. */
+function findTokenInObject(obj) {
+    if (obj === null || obj === undefined)
+        return undefined;
+    if (typeof obj === "string")
+        return looksLikeToken(obj) ? obj : undefined;
+    if (typeof obj !== "object")
+        return undefined;
+    const rec = obj;
+    const direct = rec.accessToken ?? rec.access_token ?? rec.token;
+    if (typeof direct === "string" && looksLikeToken(direct))
+        return direct;
+    for (const key of Object.keys(rec)) {
+        const found = findTokenInObject(rec[key]);
+        if (found)
+            return found;
+    }
+    return undefined;
+}
+/** Parse redux-persist style value (may be double stringified). */
+function parsePersistValue(raw) {
+    if (!raw)
+        return null;
     try {
+        const first = JSON.parse(raw);
+        if (typeof first === "string") {
+            try {
+                return JSON.parse(first);
+            }
+            catch {
+                return first;
+            }
+        }
+        return first;
+    }
+    catch {
+        return null;
+    }
+}
+/** Get a nested value that may be a string (need parse) or already an object. */
+function parseNestedValue(val) {
+    if (val == null)
+        return null;
+    if (typeof val === "string")
+        return parsePersistValue(val);
+    return val;
+}
+const AUTH_DEBUG = true; // set to false to disable access-token debug logs
+/**
+ * Extract access token from persist:userdb shape: authDetails (string) → parse → auth.accessToken.
+ * Structure: { authDetails: "{\"auth\":{\"accessToken\":\"...\"}}", profileInformation: "...", _persist: "..." }
+ */
+function getTokenFromUserDbPersist(parsed) {
+    console.log("[header-auth] getTokenFromUserDbPersist: parsed keys", Object.keys(parsed));
+    const authDetails = parsed.authDetails;
+    const inner = parseNestedValue(authDetails);
+    const obj = typeof inner === "object" && inner !== null ? inner : null;
+    console.log("[header-auth] getTokenFromUserDbPersist: inner type", typeof inner, "obj keys", obj ? Object.keys(obj) : null);
+    if (!obj)
+        return undefined;
+    const auth = obj.auth;
+    const authObj = typeof auth === "object" && auth !== null ? auth : null;
+    console.log("[header-auth] getTokenFromUserDbPersist: authObj keys", authObj ? Object.keys(authObj) : null);
+    if (!authObj)
+        return undefined;
+    const token = authObj.accessToken ??
+        authObj.access_token ??
+        authObj.token;
+    const ok = typeof token === "string" && looksLikeToken(token);
+    console.log("[header-auth] getTokenFromUserDbPersist: token found", !!ok, "length", typeof token === "string" ? token.length : 0);
+    return ok ? token : undefined;
+}
+/**
+ * Get access token from all known storage keys (header, IAM, userdb, and plain keys).
+ * persist:userdb shape: authDetails (stringified) contains auth.accessToken.
+ */
+function getAccessTokenForRequest() {
+    console.log("[header-auth] getAccessTokenForRequest: start");
+    const keysToTry = [
+        PERSIST_HEADER_KEY,
+        "persist:linn-i-am",
+        "persist:userdb",
+        "token",
+        "accessToken",
+        "auth",
+    ];
+    for (const key of keysToTry) {
+        const raw = localStorage.getItem(key);
+        console.log("[header-auth] getAccessTokenForRequest: key", key, "raw present", !!raw, "raw length", raw?.length ?? 0);
+        if (!raw)
+            continue;
+        const parsed = key.startsWith("persist:") ? parsePersistValue(raw) : (() => { try {
+            return JSON.parse(raw);
+        }
+        catch {
+            return raw;
+        } })();
+        const token = findTokenInObject(parsed);
+        if (token) {
+            console.log("[header-auth] getAccessTokenForRequest: token from findTokenInObject(parsed), key", key);
+            return token;
+        }
+        if (key.startsWith("persist:")) {
+            const outer = typeof parsed === "object" && parsed !== null ? parsed : null;
+            if (outer) {
+                if (key === "persist:userdb") {
+                    const fromUserDb = getTokenFromUserDbPersist(outer);
+                    if (fromUserDb) {
+                        console.log("[header-auth] getAccessTokenForRequest: token from getTokenFromUserDbPersist");
+                        return fromUserDb;
+                    }
+                }
+                for (const k of Object.keys(outer)) {
+                    const inner = parseNestedValue(outer[k]);
+                    const t = findTokenInObject(inner);
+                    if (t) {
+                        console.log("[header-auth] getAccessTokenForRequest: token from inner key", k);
+                        return t;
+                    }
+                }
+            }
+        }
+    }
+    const allData = getAllDataFromStorage();
+    const fallback = getAccessTokenFromAuth(allData.auth);
+    console.log("[header-auth] getAccessTokenForRequest: fallback getAllDataFromStorage().auth, token present", !!fallback);
+    return fallback;
+}
+const fetchProfilePictureAsBlobUrl = async (baseUrl = "http://objectstore.impact0mics.local:9012", accessTokenOverride) => {
+    try {
+        if (AUTH_DEBUG)
+            console.log("[header-auth] fetchProfilePictureAsBlobUrl: start, accessTokenOverride present", typeof accessTokenOverride === "string" && accessTokenOverride.length > 0);
         const profilePictureUrl = getProfilePictureUrl(baseUrl);
-        if (!profilePictureUrl)
+        if (!profilePictureUrl) {
+            if (AUTH_DEBUG)
+                console.log("[header-auth] fetchProfilePictureAsBlobUrl: no profilePictureUrl, abort");
             return null;
-        const allData = getAllDataFromStorage();
-        const accessToken = getAccessTokenFromAuth(allData.auth);
+        }
+        if (AUTH_DEBUG)
+            console.log("[header-auth] fetchProfilePictureAsBlobUrl: profilePictureUrl", profilePictureUrl);
+        const accessToken = (typeof accessTokenOverride === "string" && accessTokenOverride.length > 0
+            ? accessTokenOverride
+            : null) ?? getAccessTokenForRequest();
+        if (AUTH_DEBUG)
+            console.log("[header-auth] fetchProfilePictureAsBlobUrl: accessToken present", !!accessToken, "length", accessToken?.length ?? 0);
         const headers = {};
         if (accessToken) {
             headers["Authorization"] = `Bearer ${accessToken}`;
         }
+        if (AUTH_DEBUG)
+            console.log("[header-auth] fetchProfilePictureAsBlobUrl: request headers", { ...headers, Authorization: headers["Authorization"] ? "Bearer ***" : "(none)" });
         const response = await fetch(profilePictureUrl, { method: "GET", headers });
         if (!response.ok) {
             console.warn(`Failed to fetch profile picture: ${response.status} ${response.statusText}`);
@@ -563,7 +707,7 @@ const DEFAULT_ROUTES = {
     profile: "/user/profile",
     logout: "/user/login",
 };
-const AppHeader = ({ language: languageProp }) => {
+const AppHeader = ({ language: languageProp, accessToken: accessTokenProp }) => {
     // Get initial language from props, URL, localStorage, or default to 'en'
     const getInitialLanguage = () => {
         // Priority 1: Props
@@ -660,12 +804,18 @@ const AppHeader = ({ language: languageProp }) => {
                 userRole = userRole || profileData.role || profileData.userRole || "";
             }
         }
+        const avatarSrc = storedUser?.avatar ??
+            allData.auth?.avatar ??
+            allData.profile?.avatar;
+        const initialsVal = storedUser?.initials ??
+            allData.auth?.initials ??
+            allData.profile?.initials;
         return {
             name: userName || "",
             email: userEmail || "",
             role: userRole || "",
-            avatar: storedUser?.avatar || allData.auth?.avatar || allData.profile?.avatar || undefined,
-            initials: storedUser?.initials || allData.auth?.initials || allData.profile?.initials || undefined,
+            avatar: typeof avatarSrc === "string" ? avatarSrc : undefined,
+            initials: typeof initialsVal === "string" ? initialsVal : undefined,
         };
     });
     const [notificationCount, setNotificationCount] = React.useState(() => {
@@ -680,8 +830,10 @@ const AppHeader = ({ language: languageProp }) => {
     // Fetch profile picture from API when component mounts or user data changes
     React.useEffect(() => {
         const fetchProfilePicture = async () => {
-            // Try to fetch profile picture from API
-            const blobUrl = await fetchProfilePictureAsBlobUrl();
+            console.log("[header-auth] AppHeader: profile picture effect, accessTokenProp present", !!accessTokenProp);
+            const token = accessTokenProp ?? getAccessTokenForRequest();
+            console.log("[header-auth] AppHeader: token for request present", !!token, "from prop", !!accessTokenProp);
+            const blobUrl = await fetchProfilePictureAsBlobUrl(undefined, token ?? undefined);
             if (blobUrl) {
                 // Clean up previous blob URL if it exists
                 setProfilePictureBlobUrl((prevUrl) => {
@@ -702,7 +854,7 @@ const AppHeader = ({ language: languageProp }) => {
                 return null;
             });
         };
-    }, []); // Only run once on mount - fetch when component loads
+    }, [accessTokenProp]); // Refetch when accessToken prop changes (e.g. after login)
     React.useEffect(() => {
         const allData = getAllDataFromStorage();
         let userName = "";
@@ -1039,6 +1191,7 @@ exports.DrawerProvider = DrawerProvider;
 exports.PERSIST_HEADER_KEY = PERSIST_HEADER_KEY;
 exports.USER_DETAILS_STORAGE_KEY = USER_DETAILS_STORAGE_KEY;
 exports.fetchProfilePictureAsBlobUrl = fetchProfilePictureAsBlobUrl;
+exports.getAccessTokenForRequest = getAccessTokenForRequest;
 exports.getAllDataFromStorage = getAllDataFromStorage;
 exports.getI18nLocaleFromStorage = getI18nLocaleFromStorage;
 exports.getMessageCountFromStorage = getMessageCountFromStorage;