From 57fa421f1f91676ed03024f144b9f82e87ebe79f Mon Sep 17 00:00:00 2001 From: lashman Date: Sat, 21 Mar 2026 22:34:12 +0200 Subject: [PATCH] fetch admin avatar from admin endpoint instead of anonymous user --- packages/api/src/routes/admin/auth.ts | 3 ++- packages/web/src/pages/admin/AdminTeam.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/api/src/routes/admin/auth.ts b/packages/api/src/routes/admin/auth.ts index 5b1bd03..df967ea 100644 --- a/packages/api/src/routes/admin/auth.ts +++ b/packages/api/src/routes/admin/auth.ts @@ -176,7 +176,7 @@ export default async function adminAuthRoutes(app: FastifyInstance) { } const admin = await prisma.adminUser.findUnique({ where: { id: req.adminId }, - select: { role: true, displayName: true, teamTitle: true }, + select: { role: true, displayName: true, teamTitle: true, linkedUserId: true, linkedUser: { select: { avatarPath: true } } }, }); if (!admin) { reply.send({ isAdmin: false }); @@ -187,6 +187,7 @@ export default async function adminAuthRoutes(app: FastifyInstance) { role: admin.role, displayName: admin.displayName ? decrypt(admin.displayName, masterKey) : null, teamTitle: admin.teamTitle ? decrypt(admin.teamTitle, masterKey) : null, + avatarUrl: admin.linkedUser?.avatarPath ? `/api/v1/avatars/${admin.linkedUserId}` : null, }); } ); diff --git a/packages/web/src/pages/admin/AdminTeam.tsx b/packages/web/src/pages/admin/AdminTeam.tsx index 3c67be7..76770c4 100644 --- a/packages/web/src/pages/admin/AdminTeam.tsx +++ b/packages/web/src/pages/admin/AdminTeam.tsx @@ -140,7 +140,7 @@ export default function AdminTeam() { useEffect(() => { fetchMembers(); fetchInvites() }, []) useEffect(() => { - api.get<{ avatarUrl: string | null }>('/me').then((d) => setAvatarUrl(d.avatarUrl ?? null)).catch(() => {}) + api.get<{ avatarUrl?: string | null }>('/admin/me').then((d) => setAvatarUrl(d.avatarUrl ?? null)).catch(() => {}) }, []) const handleAvatarUpload = async (e: React.ChangeEvent) => {