lashman/echoboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fetch admin avatar from admin endpoint instead of anonymous user

Browse Source
This commit is contained in:
lashman
2026-03-21 22:34:12 +02:00
parent aba03b67b0
commit 57fa421f1f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/api/src/routes/admin/auth.ts
View File

@@ -176,7 +176,7 @@ export default async function adminAuthRoutes(app: FastifyInstance) {
} }
const admin = await prisma.adminUser.findUnique({ const admin = await prisma.adminUser.findUnique({
where: { id: req.adminId }, 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) { if (!admin) {
reply.send({ isAdmin: false }); reply.send({ isAdmin: false });
@@ -187,6 +187,7 @@ export default async function adminAuthRoutes(app: FastifyInstance) {
role: admin.role, role: admin.role,
displayName: admin.displayName ? decrypt(admin.displayName, masterKey) : null, displayName: admin.displayName ? decrypt(admin.displayName, masterKey) : null,
teamTitle: admin.teamTitle ? decrypt(admin.teamTitle, masterKey) : null, teamTitle: admin.teamTitle ? decrypt(admin.teamTitle, masterKey) : null,
avatarUrl: admin.linkedUser?.avatarPath ? `/api/v1/avatars/${admin.linkedUserId}` : null,
}); });
} }
); );

2
packages/web/src/pages/admin/AdminTeam.tsx
View File

@@ -140,7 +140,7 @@ export default function AdminTeam() {
useEffect(() => { fetchMembers(); fetchInvites() }, []) useEffect(() => { fetchMembers(); fetchInvites() }, [])
useEffect(() => { 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<HTMLInputElement>) => { const handleAvatarUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {