varminer-app-header 2.2.7 → 2.2.9

package/dist/index.js

@@ -393,22 +393,28 @@ const getAllDataFromStorage = () => {
  * @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
  */
+const VERIFICATION_USER_ID = 4590; // set to null to use only storage userId
 const getProfilePictureUrl = (baseUrl = "http://objectstore.impact0mics.local:9012") => {
     try {
         const allData = getAllDataFromStorage();
-        const userId = allData.decodedToken?.user_id ?? allData.auth?.user_id ?? getStoredUserDetails()?.userId ?? null;
+        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/4590`;
+        return `${baseUrl.replace(/\/$/, "")}/v1/objectStore/profilePicture/path/${userId}`;
     }
     catch (err) {
         console.error("Error getting profile picture URL:", err);
         return null;
     }
 };
+/** Extract S3 object key from s3Uri (e.g. s3://bucket/key → key). */
+function getKeyFromS3Uri(s3Uri) {
+    const match = /^s3:\/\/[^/]+\/(.+)$/.exec(s3Uri.trim());
+    return match ? match[1] : null;
+}
 /**
- * Fetch profile picture from object store API (plain GET with Authorization header).
- * API returns the image directly; response is converted to a blob URL for use in img src.
+ * 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
  */
@@ -538,8 +544,8 @@ function getAccessTokenForRequest() {
 }
 const fetchProfilePictureAsBlobUrl = async (baseUrl = "http://objectstore.impact0mics.local:9012", accessTokenOverride) => {
     try {
-        const profilePictureUrl = getProfilePictureUrl(baseUrl);
-        if (!profilePictureUrl)
+        const profilePicturePathUrl = getProfilePictureUrl(baseUrl);
+        if (!profilePicturePathUrl)
             return null;
         const accessToken = (typeof accessTokenOverride === "string" && accessTokenOverride.length > 0
             ? accessTokenOverride
@@ -551,17 +557,64 @@ const fetchProfilePictureAsBlobUrl = async (baseUrl = "http://objectstore.impact
         if (accessToken) {
             headers["Authorization"] = `Bearer ${accessToken}`;
         }
-        const response = await fetch(profilePictureUrl, { method: "GET", headers });
-        if (!response.ok) {
-            console.warn(`Failed to fetch profile picture: ${response.status} ${response.statusText}`);
+        // Step 1: GET path API → JSON with filePath, s3Uri
+        const pathResponse = await fetch(profilePicturePathUrl, { method: "GET", headers });
+        if (!pathResponse.ok) {
+            console.warn(`Failed to fetch profile picture path: ${pathResponse.status} ${pathResponse.statusText}`);
+            return null;
+        }
+        const pathData = (await pathResponse.json());
+        const status = pathData?.statusResponse?.status;
+        if (status !== "SUCCESS") {
+            console.warn("Profile picture path API did not return SUCCESS:", status, pathData?.errors);
+            return null;
+        }
+        // Key for download API: from s3Uri (s3://bucket/key) or response.key
+        let downloadKey = pathData.key ??
+            (pathData.s3Uri ? getKeyFromS3Uri(pathData.s3Uri) : null);
+        if (!downloadKey && pathData.filePath) {
+            try {
+                const u = new URL(pathData.filePath);
+                downloadKey = u.pathname.replace(/^\//, ""); // path without leading slash as key
+            }
+            catch {
+                // ignore
+            }
+        }
+        if (!downloadKey) {
+            console.warn("Profile picture response has no key/s3Uri/filePath for download");
+            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) {
+            console.warn(`Failed to fetch profile picture image: ${imageResponse.status} ${imageResponse.statusText}`);
+            return null;
+        }
+        const downloadData = (await imageResponse.json());
+        const downloadStatus = downloadData?.statusResponse?.status;
+        if (downloadStatus !== "SUCCESS") {
+            console.warn("Profile picture download API did not return SUCCESS:", downloadStatus, downloadData?.errors);
+            return null;
+        }
+        const fileContent = downloadData?.fileContent;
+        const contentType = (downloadData?.contentType || "").trim() || "image/png";
+        if (!fileContent || typeof fileContent !== "string") {
+            console.warn("Profile picture download response has no fileContent");
             return null;
         }
-        const contentType = response.headers.get("content-type");
-        if (!contentType || !contentType.startsWith("image/")) {
-            console.warn(`Profile picture response is not an image: ${contentType}`);
+        if (!contentType.startsWith("image/")) {
+            console.warn(`Profile picture download contentType is not an image: ${contentType}`);
             return null;
         }
-        const blob = await response.blob();
+        // Decode base64 fileContent → Blob → object URL
+        const binary = atob(fileContent);
+        const bytes = new Uint8Array(binary.length);
+        for (let i = 0; i < binary.length; i++)
+            bytes[i] = binary.charCodeAt(i);
+        const blob = new Blob([bytes], { type: contentType });
         return URL.createObjectURL(blob);
     }
     catch (err) {