varminer-app-header 2.2.9 → 2.3.0

package/dist/index.js

@@ -390,17 +390,20 @@ const getAllDataFromStorage = () => {
 };
 /**
  * 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 user_id is not available
+ * @param baseUrl - Base URL for the object store API (e.g. from objectStoreUrl prop). When missing or empty, returns null.
+ * @returns Profile picture URL or null if user_id or baseUrl is not available
  */
 const VERIFICATION_USER_ID = 4590; // set to null to use only storage userId
-const getProfilePictureUrl = (baseUrl = "http://objectstore.impact0mics.local:9012") => {
+const getProfilePictureUrl = (baseUrl) => {
     try {
+        const url = typeof baseUrl === "string" && baseUrl.trim() ? baseUrl.trim() : null;
+        if (!url)
+            return null;
         const allData = getAllDataFromStorage();
         const userId = allData.decodedToken?.user_id ?? allData.auth?.user_id ?? getStoredUserDetails()?.userId ?? VERIFICATION_USER_ID ?? null;
         if (userId == null)
             return null;
-        return `${baseUrl.replace(/\/$/, "")}/v1/objectStore/profilePicture/path/${userId}`;
+        return `${url.replace(/\/$/, "")}/v1/objectStore/profilePicture/path/${userId}`;
     }
     catch (err) {
         console.error("Error getting profile picture URL:", err);
@@ -415,8 +418,8 @@ function getKeyFromS3Uri(s3Uri) {
 /**
  * Fetch profile picture: (1) GET path API for JSON with filePath/s3Uri, (2) GET download API with key; download returns JSON with base64 fileContent.
  * Path API: { statusResponse, filePath, s3Uri, errors }. Download API: { statusResponse, fileName, contentType, fileContent (base64), errors }.
- * @param baseUrl - Base URL for the object store API (default: http://objectstore.impact0mics.local:9012)
- * @returns Promise that resolves to blob URL string or null if fetch fails
+ * @param baseUrl - Base URL for the object store API (e.g. from objectStoreUrl prop). When missing or empty, returns null without fetching.
+ * @returns Promise that resolves to blob URL string or null if fetch fails or baseUrl not provided
  */
 /** Resolve access token from auth object (supports accessToken, access_token, token). */
 function getAccessTokenFromAuth(auth) {
@@ -542,11 +545,14 @@ function getAccessTokenForRequest() {
     }
     return getAccessTokenFromAuth(getAllDataFromStorage().auth);
 }
-const fetchProfilePictureAsBlobUrl = async (baseUrl = "http://objectstore.impact0mics.local:9012", accessTokenOverride) => {
+const fetchProfilePictureAsBlobUrl = async (baseUrl, accessTokenOverride) => {
     try {
         const profilePicturePathUrl = getProfilePictureUrl(baseUrl);
         if (!profilePicturePathUrl)
             return null;
+        const cleanBase = typeof baseUrl === "string" && baseUrl.trim() ? baseUrl.trim().replace(/\/$/, "") : "";
+        if (!cleanBase)
+            return null;
         const accessToken = (typeof accessTokenOverride === "string" && accessTokenOverride.length > 0
             ? accessTokenOverride
             : null) ?? getAccessTokenForRequest();
@@ -586,7 +592,6 @@ const fetchProfilePictureAsBlobUrl = async (baseUrl = "http://objectstore.impact
             return null;
         }
         // Step 2: GET download API → JSON with fileContent (base64) and contentType
-        const cleanBase = baseUrl.replace(/\/$/, "");
         const downloadUrl = `${cleanBase}/v1/objectStore/download?key=${encodeURIComponent(downloadKey)}`;
         const imageResponse = await fetch(downloadUrl, { method: "GET", headers });
         if (!imageResponse.ok) {
@@ -735,7 +740,7 @@ const DEFAULT_ROUTES = {
     profile: "/user/profile",
     logout: "/user/login",
 };
-const AppHeader = ({ language: languageProp, accessToken: accessTokenProp }) => {
+const AppHeader = ({ language: languageProp, accessToken: accessTokenProp, objectStoreUrl }) => {
     // Get initial language from props, URL, localStorage, or default to 'en'
     const getInitialLanguage = () => {
         // Priority 1: Props
@@ -859,7 +864,7 @@ const AppHeader = ({ language: languageProp, accessToken: accessTokenProp }) =>
     React.useEffect(() => {
         const fetchProfilePicture = async () => {
             const token = accessTokenProp ?? getAccessTokenForRequest();
-            const blobUrl = await fetchProfilePictureAsBlobUrl(undefined, token ?? undefined);
+            const blobUrl = await fetchProfilePictureAsBlobUrl(objectStoreUrl ?? undefined, token ?? undefined);
             if (blobUrl) {
                 // Clean up previous blob URL if it exists
                 setProfilePictureBlobUrl((prevUrl) => {
@@ -880,7 +885,7 @@ const AppHeader = ({ language: languageProp, accessToken: accessTokenProp }) =>
                 return null;
             });
         };
-    }, [accessTokenProp]); // Refetch when accessToken prop changes (e.g. after login)
+    }, [accessTokenProp, objectStoreUrl]); // Refetch when accessToken or objectStoreUrl changes (e.g. after login or env switch)
     React.useEffect(() => {
         const allData = getAllDataFromStorage();
         let userName = "";