fix: fixed the cache reordering issue and fixed the inter-user cache data leak issue.

Author: Sahil2004

infrastructure/eid-wallet/src/lib/utils/photoCache.ts

@@ -17,6 +17,7 @@ export interface CachedPhoto {
     metaEnvelopeId: string;
     dataUrl: string;
     description: string;
+    ename: string;
 }
 
 const store = localforage.createInstance({
@@ -38,6 +39,23 @@ export async function getAllCachedPhotos(): Promise<CachedPhoto[]> {
     }
 }
 
+/** Return cached photos belonging to a specific ename. */
+export async function getCachedPhotosForEname(
+    ename: string,
+): Promise<CachedPhoto[]> {
+    const all = await getAllCachedPhotos();
+    return all.filter((p) => p.ename === ename);
+}
+
+/** Remove all cached photos. Call on logout to prevent cross-user data leaks. */
+export async function clearAllCachedPhotos(): Promise<void> {
+    try {
+        await store.clear();
+    } catch {
+        // non-fatal
+    }
+}
+
 /** Insert or update a single photo entry. */
 export async function setCachedPhoto(photo: CachedPhoto): Promise<void> {
     try {
@@ -66,7 +84,9 @@ export async function replaceAllCachedPhotos(
 ): Promise<void> {
     try {
         await store.clear();
-        await Promise.all(photos.map((p) => store.setItem(p.metaEnvelopeId, p)));
+        await Promise.all(
+            photos.map((p) => store.setItem(p.metaEnvelopeId, p)),
+        );
     } catch {
         // non-fatal
     }

infrastructure/eid-wallet/src/routes/(app)/personal/+page.svelte

@@ -24,7 +24,7 @@ import {
 } from "$lib/utils/personalBinding";
 import {
     deleteCachedPhoto,
-    getAllCachedPhotos,
+    getCachedPhotosForEname,
     setCachedPhoto,
 } from "$lib/utils/photoCache";
 import { Delete02Icon, PencilEdit02Icon } from "@hugeicons/core-free-icons";
@@ -36,6 +36,11 @@ import AddPhotoSheet from "./components/AddPhotoSheet.svelte";
 
 const binding = $derived($personalBinding);
 const achieved = $derived(marksAchieved(binding));
+const sortedPhotos = $derived(
+    [...binding.photos].sort((a, b) =>
+        (a.metaEnvelopeId ?? a.id).localeCompare(b.metaEnvelopeId ?? b.id),
+    ),
+);
 const photosFilled = $derived(binding.photos.length > 0);
 const parametersFilled = $derived(
     !!binding.parameters && binding.parameters.text.trim().length > 0,
@@ -98,7 +103,7 @@ onMount(() => {
             // This runs before the network requests so photos are already
             // in the store when loading = false fires and the UI becomes
             // visible — no skeleton flash on repeat visits.
-            const cachedPhotos = await getAllCachedPhotos();
+            const cachedPhotos = await getCachedPhotosForEname(ename);
             if (cachedPhotos.length > 0) {
                 replaceAll({
                     ...$personalBinding,
@@ -118,26 +123,38 @@ onMount(() => {
             // base64 blobs and arrive later — they update the store and
             // refresh the cache when done.
             const paramsPromise = loadPersonalParameters(gqlUrl, ename).then(
-                (params) => { setParametersLocal(params); },
-            );
-            const securityPromise = loadPersonalSecurityQuestion(gqlUrl, ename).then(
-                (security) => { setKnowledgeLocal(security); },
+                (params) => {
+                    setParametersLocal(params);
+                },
             );
+            const securityPromise = loadPersonalSecurityQuestion(
+                gqlUrl,
+                ename,
+            ).then((security) => {
+                setKnowledgeLocal(security);
+            });
             const photosPromise = loadPersonalPhotographs(gqlUrl, ename).then(
                 async (photographs) => {
+                    if (!ename) return;
                     const current = $personalBinding;
 
                     // Strip photos that the user deleted during this session
                     // so a slow server response never resurrects them.
                     const visibleFromServer = photographs.filter(
                         (p) => !locallyDeletedIds.has(p.metaEnvelopeId),
                     );
-                    const visibleIds = new Set(visibleFromServer.map((p) => p.metaEnvelopeId));
+                    const visibleIds = new Set(
+                        visibleFromServer.map((p) => p.metaEnvelopeId),
+                    );
 
                     // Photos in the store not in the server response were
                     // uploaded after this fetch started — keep them.
                     const localPending = current.photos.filter(
-                        (p) => p.dataUrl && p.metaEnvelopeId !== null && !visibleIds.has(p.metaEnvelopeId) && !locallyDeletedIds.has(p.metaEnvelopeId),
+                        (p) =>
+                            p.dataUrl &&
+                            p.metaEnvelopeId !== null &&
+                            !visibleIds.has(p.metaEnvelopeId) &&
+                            !locallyDeletedIds.has(p.metaEnvelopeId),
                     );
 
                     replaceAll({
@@ -161,6 +178,7 @@ onMount(() => {
                                 metaEnvelopeId: p.metaEnvelopeId,
                                 dataUrl: p.photoBlob,
                                 description: p.description,
+                                ename: ename,
                             }),
                         ),
                     );
@@ -170,7 +188,7 @@ onMount(() => {
                     const localPendingIds = new Set(
                         localPending.map((p) => p.metaEnvelopeId),
                     );
-                    const allCached = await getAllCachedPhotos();
+                    const allCached = await getCachedPhotosForEname(ename);
                     await Promise.all(
                         allCached
                             .filter(
@@ -267,6 +285,7 @@ async function handlePhotoSave(data: {
             metaEnvelopeId: id,
             dataUrl: data.dataUrl,
             description: data.description,
+            ename: ename ?? "",
         });
         editingPhoto = null;
 
@@ -434,7 +453,7 @@ async function handleKnowledgeSave(data: {
 {#snippet photosBody()}
     {#if binding.photos.length > 0 || loading}
         <ul class="flex flex-col gap-3 mt-3">
-            {#each binding.photos as photo (photo.id)}
+            {#each sortedPhotos as photo (photo.id)}
                 {#if photo.dataUrl}
                     <li class="flex items-center gap-3">
                         <img

infrastructure/eid-wallet/src/routes/(app)/settings/+page.svelte

@@ -8,6 +8,7 @@ import {
     subscribe as subscribeLanguage,
 } from "$lib/stores/language";
 import { clearAllNotifications } from "$lib/stores/notifications";
+import { clearAllCachedPhotos } from "$lib/utils/photoCache";
 import { BottomSheet, ButtonAction } from "$lib/ui";
 import { PinIcon, PrivacyIcon } from "$lib/ui/icons";
 import { isPermissionGranted } from "@choochmeque/tauri-plugin-notifications-api";
@@ -82,6 +83,7 @@ function cancelLogout() {
 async function performLogout() {
     isLogoutDrawerOpen = false;
     clearAllNotifications();
+    await clearAllCachedPhotos();
     if (!globalState) {
         console.error("Cannot logout: global state not ready");
         return;