Three related cleanups while QA-testing on iPad:
1. Origin-forwarding bug on /api/auth/sign-in-by-identifier
- The custom identifier-sign-in route forwarded to better-auth's
/sign-in/email handler but did NOT preserve the inbound Origin +
Referer headers. Better-auth's CSRF check then 403'd every login
with MISSING_OR_NULL_ORIGIN — and the UI showed a generic
"Invalid credentials" toast even when the password was right.
- Fix: pass through req.headers.get('origin') and
req.headers.get('referer') when constructing forwardReq.
- Affects: every login attempt from any device (this isn't dev-
only); discovered testing from 192.168.1.17 → app on the same
LAN IP. Production users hit the same path.
2. Dark mode disabled
- Drop the Sun/Moon toggle from user-menu, the documentElement
class flip, darkMode from ui-store, darkMode from the user-
preferences validator. Hardcode sonner theme="light" (was
reading next-themes which isn't actually wired anywhere else).
- The 10 stray `dark:` Tailwind utilities are left alone — they're
inactive without the `dark` class on <html> so they don't ship
anything that renders, just dead CSS.
3. Center dialog animation
- Dialog content was sliding in from the top-right corner (slide-
in-from-left-1/2 + slide-in-from-top-[48%]) which felt jarring.
Drop the slide directions, keep just zoom-in-95 + the base
fade-in/out so dialogs appear in place with a subtle scale-up.
4. Login placeholder
- Removed the "you@example.com or yourname" placeholder so the
field reads as a clean empty input below the "Email or username"
label.
No tests added (the 1340 vitest suite passes); changes are surface-
level UI tweaks + the origin-header fix where a unit-test of the
custom route would mostly be testing better-auth's behaviour.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
139 lines
5.2 KiB
TypeScript
139 lines
5.2 KiB
TypeScript
'use client';
|
|
|
|
/**
|
|
* Unified user menu - used by the topbar avatar AND the sidebar-footer
|
|
* profile row. Encapsulates:
|
|
* - Profile / Settings / Notification preferences links
|
|
* - Dark-mode toggle
|
|
* - Sign out
|
|
* - Inline port switcher (when the user has access to >1 port)
|
|
*
|
|
* Everywhere a "click my profile" affordance lives, it should mount this
|
|
* component. That keeps the menu items consistent regardless of which
|
|
* trigger the user reached for.
|
|
*/
|
|
|
|
import { useRouter } from 'next/navigation';
|
|
import { useQueryClient } from '@tanstack/react-query';
|
|
import { LogOut, User, Settings, Bell, Check, Building2 } from 'lucide-react';
|
|
import { type ReactNode } from 'react';
|
|
|
|
import { useUIStore } from '@/stores/ui-store';
|
|
import {
|
|
DropdownMenu,
|
|
DropdownMenuContent,
|
|
DropdownMenuItem,
|
|
DropdownMenuLabel,
|
|
DropdownMenuSeparator,
|
|
DropdownMenuSub,
|
|
DropdownMenuSubContent,
|
|
DropdownMenuSubTrigger,
|
|
DropdownMenuTrigger,
|
|
} from '@/components/ui/dropdown-menu';
|
|
import type { Port } from '@/lib/db/schema/ports';
|
|
|
|
interface UserMenuProps {
|
|
/** Element rendered as the dropdown trigger. Must be a single React node
|
|
* that can receive a click handler (asChild semantics). */
|
|
trigger: ReactNode;
|
|
/** "start" anchors menu under a sidebar-footer trigger (left edge);
|
|
* "end" anchors under a top-right avatar. Forwarded to Radix. */
|
|
align?: 'start' | 'end';
|
|
user?: { name: string; email: string };
|
|
/** Ports the user has access to. When length > 1, renders a port-switcher
|
|
* group inside the menu. When ≤ 1, the switcher is omitted. */
|
|
ports?: Port[];
|
|
}
|
|
|
|
export function UserMenu({ trigger, align = 'end', user, ports }: UserMenuProps) {
|
|
const router = useRouter();
|
|
const queryClient = useQueryClient();
|
|
const currentPortId = useUIStore((s) => s.currentPortId);
|
|
const currentPortSlug = useUIStore((s) => s.currentPortSlug);
|
|
const setPort = useUIStore((s) => s.setPort);
|
|
|
|
const base = currentPortSlug ? `/${currentPortSlug}` : '';
|
|
const showPortSwitcher = ports && ports.length > 1;
|
|
|
|
function handlePortChange(port: Port) {
|
|
if (port.id === currentPortId) return;
|
|
setPort(port.id, port.slug);
|
|
// All cached queries are port-scoped - invalidate so they refetch with
|
|
// the new X-Port-Id header.
|
|
queryClient.invalidateQueries();
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
router.push(`/${port.slug}/dashboard` as any);
|
|
}
|
|
|
|
return (
|
|
<DropdownMenu>
|
|
<DropdownMenuTrigger asChild>{trigger}</DropdownMenuTrigger>
|
|
<DropdownMenuContent align={align} className="w-60">
|
|
<DropdownMenuLabel>
|
|
<div className="font-medium">{user?.name ?? 'My Account'}</div>
|
|
{user?.email && (
|
|
<div className="text-xs text-muted-foreground font-normal">{user.email}</div>
|
|
)}
|
|
</DropdownMenuLabel>
|
|
<DropdownMenuSeparator />
|
|
|
|
{showPortSwitcher && (
|
|
<>
|
|
{/* Port list lives in a submenu so the user has to actively hover/
|
|
click "Switch port" to see them - the main menu stays compact
|
|
regardless of how many ports the operator has access to. */}
|
|
<DropdownMenuSub>
|
|
<DropdownMenuSubTrigger>
|
|
<Building2 className="w-4 h-4 mr-2" aria-hidden />
|
|
Switch port
|
|
</DropdownMenuSubTrigger>
|
|
<DropdownMenuSubContent className="w-56">
|
|
{ports!.map((port) => {
|
|
const active = port.id === currentPortId;
|
|
return (
|
|
<DropdownMenuItem
|
|
key={port.id}
|
|
onClick={() => handlePortChange(port)}
|
|
className={active ? 'bg-accent/40' : undefined}
|
|
>
|
|
<span className="flex-1 truncate">{port.name}</span>
|
|
{active && <Check className="ml-2 h-4 w-4 text-brand" aria-hidden />}
|
|
</DropdownMenuItem>
|
|
);
|
|
})}
|
|
</DropdownMenuSubContent>
|
|
</DropdownMenuSub>
|
|
<DropdownMenuSeparator />
|
|
</>
|
|
)}
|
|
|
|
{/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
|
|
<DropdownMenuItem onClick={() => router.push(`${base}/settings/profile` as any)}>
|
|
<User className="w-4 h-4 mr-2" aria-hidden />
|
|
Profile
|
|
</DropdownMenuItem>
|
|
{/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
|
|
<DropdownMenuItem onClick={() => router.push(`${base}/settings` as any)}>
|
|
<Settings className="w-4 h-4 mr-2" aria-hidden />
|
|
Settings
|
|
</DropdownMenuItem>
|
|
<DropdownMenuItem
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
onClick={() => router.push(`${base}/settings#notifications` as any)}
|
|
>
|
|
<Bell className="w-4 h-4 mr-2" aria-hidden />
|
|
Notification preferences
|
|
</DropdownMenuItem>
|
|
<DropdownMenuSeparator />
|
|
<DropdownMenuItem
|
|
className="text-destructive focus:text-destructive"
|
|
onClick={() => router.push('/api/auth/sign-out')}
|
|
>
|
|
<LogOut className="w-4 h-4 mr-2" aria-hidden />
|
|
Sign Out
|
|
</DropdownMenuItem>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
);
|
|
}
|