Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ export function Sidebar({ user, collapsed, onToggle }: t.SidebarProps) {
const handleLogout = async () => {
setIsLoggingOut(true);
try {
await adminLogoutFn();
const result = await adminLogoutFn();
if (!result.error && result.redirect) {
window.location.href = result.redirect;
return;
}
await router.invalidate();
router.navigate({ to: '/login', search: { redirect: '/' } });
} catch (error) {
Expand Down
11 changes: 9 additions & 2 deletions src/server/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -287,25 +287,32 @@ export const requireAuthFn = createServerFn({ method: 'GET' })
};
});

const logoutResponseSchema = z.object({ redirect: z.string().optional() });

export const adminLogoutFn = createServerFn({ method: 'POST' }).handler(async () => {
try {
const session = await useAppSession();
const token = session.data.token;

let redirect: string | undefined;
if (token) {
try {
await fetch(`${getServerApiUrl()}/api/auth/logout`, {
const response = await fetch(`${getServerApiUrl()}/api/auth/logout`, {
method: 'POST',
headers: { Authorization: `Bearer ${token}` },
});
const parsed = logoutResponseSchema.safeParse(await response.json().catch(() => ({})));
if (parsed.success) {
redirect = parsed.data.redirect;
}
} catch {
// Ignore remote logout errors
}
}

await clearSession(session);

return { error: false };
return { error: false, redirect };
} catch (error) {
console.error('Admin logout error:', error);
return { error: true, message: 'Logout failed' };
Expand Down