Email for professionals and teams
improve permissions
Hieu Nguyen (Jack)8aa184db1b6e
diff --git a/drizzle/migrations/0050_add_primary_admin.sql b/drizzle/migrations/0050_add_primary_admin.sqlnew file mode 100644index 0000000..e2c88bf--- /dev/null+++ b/drizzle/migrations/0050_add_primary_admin.sql@@ -0,0 +1,22 @@+-- Exactly one account is the primary admin: the earliest-created admin becomes+-- it on upgrade so existing installs keep a single owner of admin management.+ALTER TABLE `users` ADD `is_primary_admin` integer DEFAULT false NOT NULL;+ALTER TABLE `users` ADD `can_manage_domains` integer DEFAULT false NOT NULL;+ALTER TABLE `users` ADD `can_manage_users` integer DEFAULT false NOT NULL;+UPDATE `users` SET `is_primary_admin` = 1+WHERE `id` = (+ SELECT `id` FROM `users` WHERE `role` = 'admin'+ ORDER BY `disabled` ASC, `created_at` ASC LIMIT 1+);+++-- Ensures existing installs that already applied 0050 (or had no admin when it+-- ran) still get a primary admin. The NOT EXISTS guard makes this a no-op once+-- one is set, so it is safe to run on every database.+UPDATE `users` SET `is_primary_admin` = 1+WHERE `role` = 'admin'+ AND `id` = (+ SELECT `id` FROM `users` WHERE `role` = 'admin'+ ORDER BY `disabled` ASC, `created_at` ASC LIMIT 1+ )+ AND NOT EXISTS (SELECT 1 FROM `users` WHERE `is_primary_admin` = 1);diff --git a/src/app/(admin)/accounts/[id]/page.tsx b/src/app/(admin)/accounts/[id]/page.tsxindex 6814b39..750059d 100644--- a/src/app/(admin)/accounts/[id]/page.tsx+++ b/src/app/(admin)/accounts/[id]/page.tsx@@ -63,6 +63,11 @@ export default function AccountDetailsPage() {<p className="mt-2 text-sm text-neutral-500">Update this account's profile and status.</p></div><section className="space-y-5 rounded-3xl bg-white p-6">+ {!account.editable && (+ <p className="rounded-2xl bg-neutral-50 p-4 text-sm text-neutral-500">+ You do not have permission to edit this account. Only the primary admin can manage admin accounts.+ </p>+ )}<div className="flex items-center gap-4"><span className="relative flex h-16 w-16 items-center justify-center overflow-hidden rounded-full bg-blue-100 text-xl font-semibold text-blue-700">{account.name.charAt(0).toUpperCase()}@@ -70,13 +75,15 @@ export default function AccountDetailsPage() {<ProgressiveAvatarImage src={getManagedAccountAvatarUrl(id, avatarVersion)} alt="" className="absolute inset-0 h-full w-full object-cover" />)}</span>- <Label className="cursor-pointer">- <span className="inline-flex h-9 items-center gap-2 rounded-md border border-neutral-200 px-3 text-sm">- <Upload className="h-4 w-4" />- Change avatar- </span>- <Input type="file" accept="image/jpeg,image/png,image/webp,image/gif" className="sr-only" onChange={(event) => void uploadAvatar(event.target.files?.[0])} />- </Label>+ {account.editable && (+ <Label className="cursor-pointer">+ <span className="inline-flex h-9 items-center gap-2 rounded-md border border-neutral-200 px-3 text-sm">+ <Upload className="h-4 w-4" />+ Change avatar+ </span>+ <Input type="file" accept="image/jpeg,image/png,image/webp,image/gif" className="sr-only" onChange={(event) => void uploadAvatar(event.target.files?.[0])} />+ </Label>+ )}</div><div className="space-y-2"><Label htmlFor="account-email">Email</Label>@@ -84,7 +91,7 @@ export default function AccountDetailsPage() {</div><div className="space-y-2"><Label htmlFor="account-name">Name</Label>- <Input id="account-name" value={account.name} onChange={(event) => setAccount({ ...account, name: event.target.value })} />+ <Input id="account-name" value={account.name} disabled={!account.editable} onChange={(event) => setAccount({ ...account, name: event.target.value })} /></div>{account.canForwardEmail && <div className="space-y-2"><Label htmlFor="forwarding-email">Forwarding email (optional)</Label>@@ -92,6 +99,7 @@ export default function AccountDetailsPage() {id="forwarding-email"type="email"value={account.forwardingEmail ?? ""}+ disabled={!account.editable}onChange={(event) => setAccount({ ...account, forwardingEmail: event.target.value || null })}placeholder="[email protected]"/>@@ -103,20 +111,22 @@ export default function AccountDetailsPage() {<div className="space-y-1"><Label htmlFor="account-enabled" className="font-semibold text-neutral-900">Account enabled</Label><p id="account-enabled-description" className="text-xs leading-5 text-neutral-500">- Allow this account to sign in and access its inboxes.+ {account.isPrimaryAdmin ? "The primary admin account always stays enabled." : "Allow this account to sign in and access its inboxes."}</p></div><Switchid="account-enabled"aria-describedby="account-enabled-description"checked={!account.disabled}- disabled={saving}+ disabled={saving || !account.editable || account.isPrimaryAdmin}onCheckedChange={(enabled) => setAccount({ ...account, disabled: !enabled })}/></div>- <Button onClick={() => void saveDetails()} disabled={saving || !account.name.trim()}>- {saving ? "Saving..." : "Save details"}- </Button>+ {account.editable && (+ <Button onClick={() => void saveDetails()} disabled={saving || !account.name.trim()}>+ {saving ? "Saving..." : "Save details"}+ </Button>+ )}</section>{message && <p className="text-sm text-neutral-500">{message}</p>}</div>diff --git a/src/app/(admin)/accounts/[id]/password/page.tsx b/src/app/(admin)/accounts/[id]/password/page.tsxindex 7c12686..4978f23 100644--- a/src/app/(admin)/accounts/[id]/password/page.tsx+++ b/src/app/(admin)/accounts/[id]/password/page.tsx@@ -32,27 +32,33 @@ export default function AccountPasswordPage() {onSubmit={(event) => void saveAccountPassword({ event, account, password, setPassword, setSaving, setMessage })}className="space-y-5 rounded-3xl bg-white p-6">- <div className="space-y-2">- <Label htmlFor="account-new-password">New password</Label>- <Input- id="account-new-password"- type="password"- autoComplete="new-password"- minLength={8}- maxLength={128}- required- value={password}- disabled={!account || saving}- onChange={(event) => setPassword(event.target.value)}- placeholder="Enter at least 8 characters"- />- <p className="text-xs leading-5 text-neutral-500">- Setting a password signs this account out everywhere. Share it with the user through another channel.- </p>- </div>- <Button type="submit" disabled={!account || saving || password.trim().length < 8}>- {saving ? "Resetting..." : "Reset password"}- </Button>+ {account && !account.editable ? (+ <p className="text-sm text-neutral-500">Only the primary admin can reset an admin account password.</p>+ ) : (+ <>+ <div className="space-y-2">+ <Label htmlFor="account-new-password">New password</Label>+ <Input+ id="account-new-password"+ type="password"+ autoComplete="new-password"+ minLength={8}+ maxLength={128}+ required+ value={password}+ disabled={!account || saving}+ onChange={(event) => setPassword(event.target.value)}+ placeholder="Enter at least 8 characters"+ />+ <p className="text-xs leading-5 text-neutral-500">+ Setting a password signs this account out everywhere. Share it with the user through another channel.+ </p>+ </div>+ <Button type="submit" disabled={!account || saving || password.trim().length < 8}>+ {saving ? "Resetting..." : "Reset password"}+ </Button>+ </>+ )}</form>{message && <p role="status" className="text-sm text-neutral-500">{message}</p>}</div>diff --git a/src/app/(admin)/accounts/[id]/permissions/page.tsx b/src/app/(admin)/accounts/[id]/permissions/page.tsxindex 0e2db49..c33e36d 100644--- a/src/app/(admin)/accounts/[id]/permissions/page.tsx+++ b/src/app/(admin)/accounts/[id]/permissions/page.tsx@@ -1,18 +1,33 @@"use client";-import { useEffect, useState } from "react";+import { useEffect, useMemo, useState } from "react";import { useParams } from "next/navigation";import { Button } from "@/components/ui/button";import { Checkbox } from "@/components/ui/checkbox";import { Select } from "@/components/ui/select";+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogClose } from "@/components/ui/dialog";+import { ProgressiveAvatarImage } from "@/components/progressive-avatar-image";+import { getAvatarColorStyle } from "@/lib/avatar-colors";+import { useCurrentUser, clearCurrentUserCache } from "@/hooks/use-current-user";import type { ManagedAccount } from "../types";-import { fetchManagedAccount, saveManagedAccount } from "../utils";+import {+ fetchManagedAccount,+ fetchTransferCandidates,+ saveManagedAccount,+ transferPrimaryAdmin,+ type TransferCandidate,+} from "../utils";export default function AccountPermissionsPage() {const { id } = useParams<{ id: string }>();+ const currentUser = useCurrentUser();const [account, setAccount] = useState<ManagedAccount | null>(null);const [saving, setSaving] = useState(false);const [message, setMessage] = useState<string | null>(null);+ const [candidates, setCandidates] = useState<TransferCandidate[]>([]);+ const [transferTargetId, setTransferTargetId] = useState("");+ const [transferOpen, setTransferOpen] = useState(false);+ const [transferring, setTransferring] = useState(false);useEffect(() => {void fetchManagedAccount(id)@@ -20,6 +35,19 @@ export default function AccountPermissionsPage() {.catch((error) => setMessage(error instanceof Error ? error.message : "Unable to load permissions"));}, [id]);+ const isPrimary = !!account?.canChangeRole;+ const transferTarget = useMemo(+ () => candidates.find((candidate) => candidate.id === transferTargetId) ?? null,+ [candidates, transferTargetId],+ );++ useEffect(() => {+ if (!isPrimary) return;+ void fetchTransferCandidates()+ .then((list) => setCandidates(list.filter((candidate) => candidate.id !== currentUser?.id && !candidate.disabled)))+ .catch(() => undefined);+ }, [isPrimary, currentUser?.id]);+async function savePermissions() {if (!account) return;setSaving(true);@@ -34,18 +62,42 @@ export default function AccountPermissionsPage() {}}+ async function confirmTransfer() {+ if (!transferTarget) return;+ setTransferring(true);+ setMessage(null);+ try {+ await transferPrimaryAdmin(transferTarget.id);+ clearCurrentUserCache();+ setTransferOpen(false);+ // A full reload drops the stale cached session so the navigation reflects the new role.+ window.location.assign(`/accounts/${transferTarget.id}/permissions`);+ } catch (error) {+ setMessage(error instanceof Error ? error.message : "Unable to transfer the primary admin role");+ setTransferring(false);+ }+ }++ const editable = !!account?.editable;+return (<div className="space-y-6"><div><h1 className="text-3xl font-medium text-neutral-900">Permissions</h1><p className="mt-2 text-sm text-neutral-500">Control what this account can manage.</p></div>+ {account?.isPrimaryAdmin && (+ <section className="rounded-3xl bg-amber-50 p-6">+ <p className="text-sm font-semibold text-amber-900">Primary admin</p>+ <p className="mt-1 text-sm text-amber-800">This account owns administration and cannot be demoted or disabled. Transfer the role to hand it over.</p>+ </section>+ )}<section className="space-y-3 rounded-3xl bg-white p-6"><label htmlFor="account-role" className="block text-sm font-semibold text-neutral-900">Role</label><Selectid="account-role"value={account?.role ?? "user"}- disabled={!account || saving}+ disabled={!account || saving || !account.canChangeRole}containerClassName="w-full sm:w-64"className="h-10 text-sm"onChange={(event) => account && setAccount({ ...account, role: event.target.value === "admin" ? "admin" : "user" })}@@ -53,7 +105,11 @@ export default function AccountPermissionsPage() {<option value="user">User</option><option value="admin">Admin</option></Select>- <p className="text-xs text-neutral-500">Admins can access administration pages and manage Team settings.</p>+ <p className="text-xs text-neutral-500">+ {account?.canChangeRole+ ? "Admins can access administration pages and manage Team settings."+ : "Only the primary admin can change roles."}+ </p></section><div className="overflow-hidden rounded-3xl bg-white"><table className="w-full text-left">@@ -73,18 +129,113 @@ export default function AccountPermissionsPage() {<Checkboxaria-label="Allow mailbox management"checked={account?.canManageMailboxes ?? false}- disabled={!account}+ disabled={!account || !editable}onChange={(event) => account && setAccount({ ...account, canManageMailboxes: event.target.checked })}/></td></tr>+ <tr>+ <td className="px-5 py-4">+ <p className="text-sm font-semibold text-neutral-900">Manage domains</p>+ <p className="mt-1 text-xs text-neutral-500">Allow this admin to add and manage domains.</p>+ </td>+ <td className="px-5 py-4 text-center">+ <Checkbox+ aria-label="Allow domain management"+ checked={account?.canManageDomains ?? false}+ disabled={!account || !account.canChangeRole}+ onChange={(event) => account && setAccount({ ...account, canManageDomains: event.target.checked })}+ />+ </td>+ </tr>+ <tr>+ <td className="px-5 py-4">+ <p className="text-sm font-semibold text-neutral-900">Manage users</p>+ <p className="mt-1 text-xs text-neutral-500">Allow this admin to add and manage user accounts.</p>+ </td>+ <td className="px-5 py-4 text-center">+ <Checkbox+ aria-label="Allow user management"+ checked={account?.canManageUsers ?? false}+ disabled={!account || !account.canChangeRole}+ onChange={(event) => account && setAccount({ ...account, canManageUsers: event.target.checked })}+ />+ </td>+ </tr></tbody></table></div>- <Button onClick={() => void savePermissions()} disabled={!account || saving}>- {saving ? "Saving..." : "Save permissions"}- </Button>+ {editable && (+ <Button onClick={() => void savePermissions()} disabled={saving}>+ {saving ? "Saving..." : "Save permissions"}+ </Button>+ )}+ {isPrimary && (+ <section className="space-y-4 rounded-3xl bg-white p-6">+ <div>+ <h2 className="text-sm font-semibold text-neutral-900">Transfer primary admin</h2>+ <p className="mt-1 text-xs text-neutral-500">Choose an account by email to take over administration. You will be asked to confirm.</p>+ </div>+ <div className="flex flex-col gap-3 sm:flex-row">+ <Select+ aria-label="Select the next primary admin"+ value={transferTargetId}+ containerClassName="w-full sm:max-w-sm"+ className="h-10 text-sm"+ onChange={(event) => setTransferTargetId(event.target.value)}+ >+ <option value="">Select an account</option>+ {candidates.map((candidate) => (+ <option key={candidate.id} value={candidate.id}>{candidate.email} — {candidate.name}</option>+ ))}+ </Select>+ <Button variant="outline" disabled={!transferTarget} onClick={() => setTransferOpen(true)}>+ Transfer primary admin+ </Button>+ </div>+ </section>+ )}{message && <p className="text-sm text-neutral-500">{message}</p>}++ <Dialog open={transferOpen} onOpenChange={setTransferOpen}>+ <DialogContent className="w-[min(420px,calc(100vw-32px))]">+ <DialogHeader>+ <DialogTitle>Transfer primary admin?</DialogTitle>+ <DialogDescription>+ You will lose primary admin access and become a regular admin.+ </DialogDescription>+ </DialogHeader>+ {transferTarget && (+ <div className="flex items-center gap-4 rounded-2xl border border-neutral-200 p-4">+ <span+ className="relative flex h-12 w-12 shrink-0 items-center justify-center overflow-hidden rounded-full font-semibold text-white"+ style={getAvatarColorStyle(transferTarget.email)}+ >+ {transferTarget.name.charAt(0).toUpperCase()}+ {transferTarget.hasAvatar && (+ <ProgressiveAvatarImage+ src={`/api/accounts/${transferTarget.id}/avatar`}+ alt=""+ className="absolute inset-0 h-full w-full object-cover"+ />+ )}+ </span>+ <span className="min-w-0">+ <span className="block truncate font-semibold text-neutral-900">{transferTarget.name}</span>+ <span className="block truncate text-sm text-neutral-500">{transferTarget.email}</span>+ </span>+ </div>+ )}+ <div className="flex justify-end gap-2">+ <DialogClose asChild>+ <Button variant="outline" disabled={transferring}>Cancel</Button>+ </DialogClose>+ <Button disabled={transferring || !transferTarget} onClick={() => void confirmTransfer()}>+ {transferring ? "Transferring..." : "Confirm transfer"}+ </Button>+ </div>+ </DialogContent>+ </Dialog></div>);}diff --git a/src/app/(admin)/accounts/[id]/types.d.ts b/src/app/(admin)/accounts/[id]/types.d.tsindex 78b42dc..4be2c2e 100644--- a/src/app/(admin)/accounts/[id]/types.d.ts+++ b/src/app/(admin)/accounts/[id]/types.d.ts@@ -3,11 +3,20 @@ export type ManagedAccount = {email: string;name: string;role: "admin" | "user";+ isPrimaryAdmin: boolean;disabled: boolean;canManageMailboxes: boolean;+ canManageDomains: boolean;+ canManageUsers: boolean;forwardingEmail: string | null;canForwardEmail: boolean;hasAvatar: boolean;+ /** Whether the signed-in admin may modify this account. */+ editable: boolean;+ /** Whether the signed-in admin may change this account's role. */+ canChangeRole: boolean;+ /** Whether the signed-in admin may hand the primary role to this account. */+ canTransferPrimary: boolean;/** Only ever set client-side when an admin types a new password; never returned by the API. */newPassword?: string;};diff --git a/src/app/(admin)/accounts/[id]/utils.ts b/src/app/(admin)/accounts/[id]/utils.tsindex 0409f48..c520671 100644--- a/src/app/(admin)/accounts/[id]/utils.ts+++ b/src/app/(admin)/accounts/[id]/utils.ts@@ -119,6 +119,8 @@ export async function saveManagedAccount(account: ManagedAccount): Promise<void>role: account.role,disabled: account.disabled,canManageMailboxes: account.canManageMailboxes,+ canManageDomains: account.canManageDomains,+ canManageUsers: account.canManageUsers,forwardingEmail: account.forwardingEmail,password: account.newPassword || undefined,}),@@ -127,6 +129,33 @@ export async function saveManagedAccount(account: ManagedAccount): Promise<void>if (!response.ok) throw new Error(data.error ?? "Unable to update account");}+export type TransferCandidate = {+ id: string;+ email: string;+ name: string;+ hasAvatar: boolean;+ disabled: boolean;+};++export async function fetchTransferCandidates(): Promise<TransferCandidate[]> {+ const response = await authFetch("/api/accounts");+ const data = (await response.json()) as { accounts?: Array<{ id: string; email: string; name: string; hasAvatar?: boolean; disabled?: boolean }>; error?: string };+ if (!response.ok) throw new Error(data.error ?? "Unable to load accounts");+ return (data.accounts ?? []).map((account) => ({+ id: account.id,+ email: account.email,+ name: account.name,+ hasAvatar: !!account.hasAvatar,+ disabled: !!account.disabled,+ }));+}++export async function transferPrimaryAdmin(accountId: string): Promise<void> {+ const response = await authFetch(`/api/accounts/${accountId}/transfer-primary`, { method: "POST" });+ const data = (await response.json()) as { error?: string };+ if (!response.ok) throw new Error(data.error ?? "Unable to transfer the primary admin role");+}+export async function uploadManagedAccountAvatar(accountId: string, file: File): Promise<void> {const form = new FormData();await appendOptimizedAvatar(form, file);diff --git a/src/app/(admin)/accounts/page.tsx b/src/app/(admin)/accounts/page.tsxindex 61bd84f..fe895c3 100644--- a/src/app/(admin)/accounts/page.tsx+++ b/src/app/(admin)/accounts/page.tsx@@ -13,6 +13,7 @@ import { ProgressiveAvatarImage } from "@/components/progressive-avatar-image";import { getAvatarColorStyle } from "@/lib/avatar-colors";import { LicenseRequiredOverlay } from "@/components/license-required-overlay";import { List, ListRow } from "@/components/ui/list";+import { useCurrentUser } from "@/hooks/use-current-user";import { AccountAliases } from "./account-aliases";import type { Account, AccountAliasDraft, AccountResponse, Domain } from "./types";@@ -24,6 +25,9 @@ async function fetchAccounts(): Promise<Account[]> {}export default function AccountsPage() {+ const currentUser = useCurrentUser();+ const canManage = !!currentUser && (currentUser.isPrimaryAdmin || currentUser.canManageUsers);+ const canChooseRole = !!currentUser?.isPrimaryAdmin;const [accounts, setAccounts] = useState<Account[]>([]);const [domains, setDomains] = useState<Domain[]>([]);const [username, setUsername] = useState("");@@ -83,15 +87,25 @@ export default function AccountsPage() {}return <div className="space-y-6">- <div className="flex items-center justify-between gap-4"><div><h1 className="text-3xl font-medium text-neutral-900">Accounts</h1><p className="mt-2 text-sm text-neutral-500">Manage Team accounts and their inboxes.</p></div>{!teamRequired && <Button onClick={() => setCreateOpen(true)}><Plus className="h-4 w-4" />New account</Button>}</div>+ <div className="flex items-center justify-between gap-4"><div><h1 className="text-3xl font-medium text-neutral-900">Accounts</h1><p className="mt-2 text-sm text-neutral-500">Manage Team accounts and their inboxes.</p></div>{!teamRequired && canManage && <Button onClick={() => setCreateOpen(true)}><Plus className="h-4 w-4" />New account</Button>}</div><div className="relative">{teamRequired && <LicenseRequiredOverlay required="Team"><div className="min-h-48 rounded-3xl bg-white" /></LicenseRequiredOverlay>}<List>{loading && <p className="text-sm text-neutral-500">Loading...</p>}- {accounts.map((account) => <ListRow key={account.id} asChild><Link href={`/accounts/${account.id}`}><span style={getAvatarColorStyle(account.email)} className="relative flex h-12 w-12 shrink-0 items-center justify-center overflow-hidden rounded-full font-semibold duration-200">{account.name.charAt(0).toUpperCase()}{account.hasAvatar && <ProgressiveAvatarImage src={`/api/accounts/${account.id}/avatar`} alt="" className="absolute inset-0 h-full w-full object-cover" />}</span><span className="min-w-0"><span className="flex items-center gap-2"><span className="truncate font-semibold text-neutral-900">{account.name}</span><span className="rounded-full bg-neutral-100 px-2 py-0.5 text-xs font-medium capitalize text-neutral-600">{account.role}</span></span><span className="block truncate text-sm text-neutral-500">{account.email}</span></span></Link></ListRow>)}+ {accounts.map((account) => {+ const locked = !currentUser?.isPrimaryAdmin && account.role === "admin" && account.id !== currentUser?.id;+ const row = <>+ <span style={getAvatarColorStyle(account.email)} className="relative flex h-12 w-12 shrink-0 items-center justify-center overflow-hidden rounded-full font-semibold duration-200">{account.name.charAt(0).toUpperCase()}{account.hasAvatar && <ProgressiveAvatarImage src={`/api/accounts/${account.id}/avatar`} alt="" className="absolute inset-0 h-full w-full object-cover" />}</span>+ <span className="min-w-0"><span className="flex items-center gap-2"><span className="truncate font-semibold text-neutral-900">{account.name}</span><span className={`rounded-full px-2 py-0.5 text-xs font-medium capitalize ${account.isPrimaryAdmin ? "bg-amber-100 text-amber-800" : "bg-neutral-100 text-neutral-600"}`}>{account.isPrimaryAdmin ? "Primary admin" : account.role}</span></span><span className="block truncate text-sm text-neutral-500">{account.email}</span></span>+ </>;+ if (locked) {+ return <ListRow key={account.id} aria-disabled="true" title="Only the primary admin can open admin accounts" className="cursor-not-allowed opacity-50">{row}</ListRow>;+ }+ return <ListRow key={account.id} asChild><Link href={`/accounts/${account.id}`}>{row}</Link></ListRow>;+ })}</List></div><Dialog open={createOpen} onOpenChange={setCreateOpen}><DialogContent className="max-h-[calc(100dvh-4rem)] w-[min(640px,calc(100vw-32px))] overflow-y-auto"><DialogHeader><DialogTitle>Add user account</DialogTitle><DialogDescription>The user can sign in with this email and password.</DialogDescription></DialogHeader><form onSubmit={createAccount}><fieldset disabled={saving} className="space-y-4"><div className="space-y-2"><Label htmlFor="account-username">Email</Label><div className="flex h-10 overflow-hidden rounded-md border border-neutral-200 bg-white"><Input id="account-username" value={username} onChange={(event) => setUsername(event.target.value)} placeholder="username" className="min-w-0 flex-1 rounded-none border-0 shadow-none" required /><span className="flex items-center text-sm text-neutral-400">@</span><Select aria-label="Domain" value={domainId} onChange={(event) => setDomainId(event.target.value)} containerClassName="min-w-0 max-w-[55%] shrink-0 rounded-none border-0 px-0" className="bg-transparent px-3 text-sm" required><option value="">Select domain</option>{domains.map((domain) => <option key={domain.id} value={domain.id}>{domain.hostname}</option>)}</Select></div></div><div className="space-y-2"><Label htmlFor="account-password">Password</Label><Input id="account-password" type="password" minLength={8} value={password} onChange={(event) => setPassword(event.target.value)} required /></div>- <div className="space-y-2"><Label htmlFor="account-role">Role</Label><Select id="account-role" value={role} onChange={(event) => setRole(event.target.value as "admin" | "user")} containerClassName="h-10 w-full bg-white px-0" className="px-3 text-sm"><option value="user">User</option><option value="admin">Admin</option></Select></div>+ {canChooseRole && <div className="space-y-2"><Label htmlFor="account-role">Role</Label><Select id="account-role" value={role} onChange={(event) => setRole(event.target.value as "admin" | "user")} containerClassName="h-10 w-full bg-white px-0" className="px-3 text-sm"><option value="user">User</option><option value="admin">Admin</option></Select></div>}<AccountAliases domains={domains} domainId={domainId} username={username} useAllDomains={useAllDomains} onUseAllDomainsChange={setUseAllDomains} aliases={aliases} onAliasesChange={setAliases} />{message && <p className="text-sm text-red-600">{message}</p>}<Button type="submit" disabled={saving || !domainId}>{saving ? "Creating..." : "Create account"}</Button></fieldset></form></DialogContent></Dialog>diff --git a/src/app/(admin)/accounts/types.d.ts b/src/app/(admin)/accounts/types.d.tsindex 645a4f5..ac36553 100644--- a/src/app/(admin)/accounts/types.d.ts+++ b/src/app/(admin)/accounts/types.d.ts@@ -26,9 +26,12 @@ export type Account = {name: string;resetEmail: string | null;role: "admin" | "user";+ isPrimaryAdmin?: boolean;disabled?: boolean;hasAvatar?: boolean;canManageMailboxes?: boolean;+ canManageDomains?: boolean;+ canManageUsers?: boolean;createdAt: string;mailboxId?: string | null;localPart?: string | null;diff --git a/src/app/(admin)/admin/page.tsx b/src/app/(admin)/admin/page.tsxindex 594f752..6c7c8d8 100644--- a/src/app/(admin)/admin/page.tsx+++ b/src/app/(admin)/admin/page.tsx@@ -1,14 +1,26 @@+"use client";+import Link from "next/link";import { BadgeDollarSign, Bot, Globe2, KeyRound, Mail, Palette, Users } from "lucide-react";import { AdminUpdateCard } from "@/components/admin-update-card";import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";+import { useCurrentUser } from "@/hooks/use-current-user";++type AdminSection = {+ href: string;+ title: string;+ description: string;+ icon: typeof Bot;+ permission?: "primary" | "domains" | "users";+};-const sections = [+const sections: AdminSection[] = [{href: "/agent",title: "Agent",description: "Choose the email assistant's AI provider and model.",icon: Bot,+ permission: "primary",},{href: "/mailboxes",@@ -21,18 +33,21 @@ const sections = [title: "Domains",description: "Add Cloudflare domains and inspect DNS state.",icon: Globe2,+ permission: "domains",},{href: "/branding",title: "Branding",description: "Customize the app name, icon, and favicon.",icon: Palette,+ permission: "primary",},{href: "/licenses",title: "Licenses",description: "Compare Pro and Team one-time licenses.",icon: BadgeDollarSign,+ permission: "primary",},{href: "/accounts",@@ -45,6 +60,7 @@ const sections = [title: "Admin API keys",description: "Manage API access to domains, accounts, and mailboxes.",icon: KeyRound,+ permission: "primary",},// {// href: "/webhooks",@@ -61,6 +77,16 @@ const sections = [];export default function AdminSettingsPage() {+ const user = useCurrentUser();++ function canSee(section: AdminSection): boolean {+ if (!section.permission) return true;+ if (!user) return false;+ if (section.permission === "primary") return user.isPrimaryAdmin;+ if (section.permission === "domains") return user.isPrimaryAdmin || user.canManageDomains;+ return user.isPrimaryAdmin || user.canManageUsers;+ }+return (<div><div className="mb-8">@@ -70,7 +96,7 @@ export default function AdminSettingsPage() {</p></div><div className="grid lg:grid-cols-2 gap-4">- {sections.map((section) => {+ {sections.filter(canSee).map((section) => {const Icon = section.icon;return (@@ -90,9 +116,11 @@ export default function AdminSettingsPage() {);})}</div>- <div className="mt-8">- <AdminUpdateCard />- </div>+ {user?.isPrimaryAdmin && (+ <div className="mt-8">+ <AdminUpdateCard />+ </div>+ )}</div>);}diff --git a/src/app/(admin)/layout.tsx b/src/app/(admin)/layout.tsxindex 59e731e..bd160af 100644--- a/src/app/(admin)/layout.tsx+++ b/src/app/(admin)/layout.tsx@@ -1,6 +1,7 @@"use client";import Link from "next/link";+import { usePathname } from "next/navigation";import { HelpCircle, Search } from "lucide-react";import { AuthGuard } from "@/components/auth/auth-guard";import { ComposeProvider } from "@/components/compose/compose-context";@@ -13,13 +14,31 @@ import { SidebarProvider } from "@/components/sidebar-state";import { SidebarResizeBoundary } from "@/components/sidebar-resize-boundary";import { ShortcutsProvider } from "@/components/shortcuts";+const primaryOnlyPrefixes = [+ "/agent",+ "/api-keys",+ "/webhooks",+ "/backups",+ "/branding",+ "/licenses",+ "/activity",+ "/audit-logs",+ "/general",+ "/ai-usage",+];+export default function DashboardLayout({children,}: {children: React.ReactNode;}) {+ const pathname = usePathname();+ const requirePrimary = primaryOnlyPrefixes.some(+ (prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`),+ );+return (- <AuthGuard requireMailbox requireRole="admin">+ <AuthGuard requireMailbox requireRole="admin" requirePrimary={requirePrimary}><SidebarProvider expandedWidth={256}><MailboxProvider><ComposeProvider>@@ -32,7 +51,7 @@ export default function DashboardLayout({<SidebarResizeBoundary /></aside><div className="flex min-h-0 min-w-0 flex-col">- <span className="fixed top-2 right-4 flex items-center gap-4">+ <span className="fixed top-2 right-4 flex items-center gap-4 z-90"><LicenseIndicator /><MailboxSelector /></span>diff --git a/src/app/api/accounts/[id]/route.ts b/src/app/api/accounts/[id]/route.tsindex 25ded44..fe6f917 100644--- a/src/app/api/accounts/[id]/route.ts+++ b/src/app/api/accounts/[id]/route.ts@@ -5,6 +5,7 @@ import { users } from "@/db/schema";import { updateManagedAccountSchema } from "@/lib/validators";import { requireTeamAdmin } from "../utils";import { getLicenseEntitlements } from "@/lib/licenses/service";+import { canManageUsers, isPrimaryAdmin } from "@/lib/auth/admin";import type { AccountRouteParams } from "./types";import { selectAccountById, updateAccountCredentials } from "./utils";import { deleteUserSessions } from "@/lib/auth/session";@@ -14,20 +15,27 @@ export async function GET(request: Request, { params }: AccountRouteParams) {if (access.error) return access.error;const { id } = await params;const account = await selectAccountById(getDb(access.env), id);- if (!account || (account.id !== access.user!.id && account.createdByUserId !== access.user!.id)) {+ if (!account) {return NextResponse.json({ error: "Account not found" }, { status: 404 });}+ const actor = access.user!;return NextResponse.json({account: {id: account.id,email: account.email,name: account.name,role: account.role,+ isPrimaryAdmin: account.isPrimaryAdmin,disabled: account.disabled,canManageMailboxes: account.canManageMailboxes,+ canManageDomains: account.canManageDomains,+ canManageUsers: account.canManageUsers,forwardingEmail: account.forwardingEmail,canForwardEmail: (await getLicenseEntitlements(access.env)).canForwardEmail,hasAvatar: !!account.avatarKey,+ editable: isPrimaryAdmin(actor) || (canManageUsers(actor) && account.role === "user" && !account.isPrimaryAdmin),+ canChangeRole: isPrimaryAdmin(actor),+ canTransferPrimary: isPrimaryAdmin(actor) && !account.isPrimaryAdmin && !account.disabled,},});}@@ -38,11 +46,23 @@ export async function PATCH(request: Request, { params }: AccountRouteParams) {const { id } = await params;const db = getDb(access.env);const account = await selectAccountById(db, id);- if (!account || (account.id !== access.user!.id && account.createdByUserId !== access.user!.id)) {+ if (!account) {return NextResponse.json({ error: "Account not found" }, { status: 404 });}+ const actor = access.user!;+ const actorIsPrimary = isPrimaryAdmin(actor);+ if (!actorIsPrimary && !canManageUsers(actor)) {+ return NextResponse.json({ error: "You do not have permission to manage users" }, { status: 403 });+ }+ // Admins without the primary role can only manage plain user accounts.+ if (!actorIsPrimary && (account.role === "admin" || account.isPrimaryAdmin)) {+ return NextResponse.json({ error: "Only the primary admin can manage admin accounts" }, { status: 403 });+ }const parsed = updateManagedAccountSchema.safeParse(await request.json());if (!parsed.success) return NextResponse.json({ error: parsed.error.flatten() }, { status: 400 });+ if (!actorIsPrimary && parsed.data.role !== account.role) {+ return NextResponse.json({ error: "Only the primary admin can change roles" }, { status: 403 });+ }const canForwardEmail = (await getLicenseEntitlements(access.env)).canForwardEmail;if (!canForwardEmail && parsed.data.forwardingEmail && parsed.data.forwardingEmail !== account.forwardingEmail) {return NextResponse.json({ error: "A Pro or Team license is required for email forwarding" }, { status: 403 });@@ -50,10 +70,15 @@ export async function PATCH(request: Request, { params }: AccountRouteParams) {await updateAccountCredentials(db, id, { name: parsed.data.name, password: parsed.data.password ?? null });// A password set by an admin is a reset: whoever held the old one is signed out.if (parsed.data.password) await deleteUserSessions(access.env, id);+ // The primary admin always stays an enabled admin; only a transfer can move the role.+ const role = account.isPrimaryAdmin ? "admin" : actorIsPrimary ? parsed.data.role : account.role;+ const disabled = account.isPrimaryAdmin ? false : parsed.data.disabled;await db.update(users).set({- role: parsed.data.role,- disabled: parsed.data.disabled,+ role,+ disabled,canManageMailboxes: parsed.data.canManageMailboxes,+ ...(actorIsPrimary && parsed.data.canManageDomains !== undefined ? { canManageDomains: parsed.data.canManageDomains } : {}),+ ...(actorIsPrimary && parsed.data.canManageUsers !== undefined ? { canManageUsers: parsed.data.canManageUsers } : {}),...(parsed.data.forwardingEmail !== undefined ? { forwardingEmail: parsed.data.forwardingEmail } : {}),}).where(eq(users.id, id));return NextResponse.json({ ok: true });diff --git a/src/app/api/accounts/[id]/transfer-primary/route.ts b/src/app/api/accounts/[id]/transfer-primary/route.tsnew file mode 100644index 0000000..7a7a68e--- /dev/null+++ b/src/app/api/accounts/[id]/transfer-primary/route.ts@@ -0,0 +1,39 @@+import { NextResponse } from "next/server";+import { eq } from "drizzle-orm";+import { getDb } from "@/db";+import { users } from "@/db/schema";+import { isPrimaryAdmin } from "@/lib/auth/admin";+import { hasValidSessionMutationOrigin } from "@/lib/auth/origin";+import { requireTeamAdmin } from "../../utils";+import type { AccountRouteParams } from "../types";+import { selectAccountById } from "../utils";++export async function POST(request: Request, { params }: AccountRouteParams) {+ const access = await requireTeamAdmin(request);+ if (access.error) return access.error;+ const actor = access.user!;+ if (!isPrimaryAdmin(actor)) {+ return NextResponse.json({ error: "Only the primary admin can transfer the role" }, { status: 403 });+ }+ if (!hasValidSessionMutationOrigin(request)) {+ return NextResponse.json({ error: "Invalid origin" }, { status: 403 });+ }+ const { id } = await params;+ const db = getDb(access.env);+ const target = await selectAccountById(db, id);+ if (!target) {+ return NextResponse.json({ error: "Account not found" }, { status: 404 });+ }+ if (target.id === actor.id) {+ return NextResponse.json({ error: "You are already the primary admin" }, { status: 400 });+ }+ if (target.disabled) {+ return NextResponse.json({ error: "Enable this account before transferring the primary admin role" }, { status: 400 });+ }+ // One atomic switch: the old owner steps down exactly as the new one steps up.+ await db.batch([+ db.update(users).set({ isPrimaryAdmin: false }).where(eq(users.id, actor.id)),+ db.update(users).set({ isPrimaryAdmin: true, role: "admin" }).where(eq(users.id, target.id)),+ ]);+ return NextResponse.json({ ok: true });+}diff --git a/src/app/api/accounts/route.ts b/src/app/api/accounts/route.tsindex b5d46e9..556b5bc 100644--- a/src/app/api/accounts/route.ts+++ b/src/app/api/accounts/route.ts@@ -1,6 +1,7 @@import { NextResponse } from "next/server";import { getDb } from "@/db";import { createUserAccountSchema } from "@/lib/validators";+import { canManageUsers, isPrimaryAdmin } from "@/lib/auth/admin";import { createAccountResponse } from "./create";import { accountListItemFromUser, listAccountsForAdmin, requireTeamAdmin } from "./utils";@@ -20,5 +21,12 @@ export async function POST(request: Request) {if (!parsed.success) {return NextResponse.json({ error: parsed.error.flatten() }, { status: 400 });}- return createAccountResponse(access.env, access.user!.id, parsed.data);+ const actor = access.user!;+ if (!canManageUsers(actor)) {+ return NextResponse.json({ error: "You do not have permission to manage users" }, { status: 403 });+ }+ if (parsed.data.role === "admin" && !isPrimaryAdmin(actor)) {+ return NextResponse.json({ error: "Only the primary admin can create admin accounts" }, { status: 403 });+ }+ return createAccountResponse(access.env, actor.id, parsed.data);}diff --git a/src/app/api/accounts/utils.ts b/src/app/api/accounts/utils.tsindex 8688892..d1c9703 100644--- a/src/app/api/accounts/utils.ts+++ b/src/app/api/accounts/utils.ts@@ -17,9 +17,12 @@ export function listAccountsForAdmin(db: Db) {name: users.name,resetEmail: users.resetEmail,role: users.role,+ isPrimaryAdmin: users.isPrimaryAdmin,disabled: users.disabled,avatarKey: users.avatarKey,canManageMailboxes: users.canManageMailboxes,+ canManageDomains: users.canManageDomains,+ canManageUsers: users.canManageUsers,createdAt: users.createdAt,}).from(users)@@ -50,9 +53,12 @@ export function accountListItemFromUser(user: {name: string;resetEmail: string | null;role: "admin" | "user";+ isPrimaryAdmin?: boolean;disabled: boolean;avatarKey?: string | null;canManageMailboxes?: boolean;+ canManageDomains?: boolean;+ canManageUsers?: boolean;createdAt: Date;}) {return {@@ -61,9 +67,12 @@ export function accountListItemFromUser(user: {name: user.name,resetEmail: user.resetEmail,role: user.role,+ isPrimaryAdmin: !!user.isPrimaryAdmin,disabled: user.disabled,hasAvatar: !!user.avatarKey,canManageMailboxes: !!user.canManageMailboxes,+ canManageDomains: !!user.canManageDomains,+ canManageUsers: !!user.canManageUsers,createdAt: user.createdAt,};}diff --git a/src/app/api/activity/route.ts b/src/app/api/activity/route.tsindex 8ce466b..6eac498 100644--- a/src/app/api/activity/route.ts+++ b/src/app/api/activity/route.ts@@ -2,7 +2,7 @@ import { desc, inArray, eq } from "drizzle-orm";import { NextResponse } from "next/server";import { getDb } from "@/db";import { auditLogs, users } from "@/db/schema";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";@@ -10,7 +10,7 @@ export async function GET(request: Request) {const env = getEnv();const admin = await requireUser(env, request);try {- assertAdmin(admin);+ assertPrimaryAdmin(admin);} catch {return NextResponse.json({ error: "Forbidden" }, { status: 403 });}diff --git a/src/app/api/admin/agent/models/utils.ts b/src/app/api/admin/agent/models/utils.tsindex 1a2cfc2..a4c3358 100644--- a/src/app/api/admin/agent/models/utils.ts+++ b/src/app/api/admin/agent/models/utils.ts@@ -1,6 +1,7 @@import { z } from "zod";import { getEnv } from "@/lib/cloudflare";import { requireSessionUser } from "@/lib/api/auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { listCloudflareAgentModels, listCompatibleAgentModels } from "@/lib/agent/provider-models";import { hasValidSessionMutationOrigin } from "@/lib/auth/origin";@@ -15,7 +16,7 @@ export async function POST(request: Request) {const env = getEnv();const session = await requireSessionUser(env, request);if (session.error) return session.error;- if (session.user.role !== "admin") return Response.json({ error: "Forbidden" }, { status: 403 });+ if (!isPrimaryAdmin(session.user)) return Response.json({ error: "Forbidden" }, { status: 403 });if (!hasValidSessionMutationOrigin(request)) return Response.json({ error: "Invalid origin" }, { status: 403 });const parsed = requestSchema.safeParse(await request.json().catch(() => null));if (!parsed.success) return Response.json({ error: "Invalid provider details" }, { status: 400 });diff --git a/src/app/api/admin/agent/utils.ts b/src/app/api/admin/agent/utils.tsindex 2c97d82..2766484 100644--- a/src/app/api/admin/agent/utils.ts+++ b/src/app/api/admin/agent/utils.ts@@ -4,6 +4,7 @@ import { getDb } from "@/db";import { agentJobs, agentSendApprovals, appSettings } from "@/db/schema";import { getEnv } from "@/lib/cloudflare";import { requireSessionUser } from "@/lib/api/auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { getAgentEnabled, getAgentProviderConfig, getAgentProviderPublicConfig, resolveAgentBaseUrl } from "@/lib/agent/provider";import { AGENT_SETTINGS_ID } from "@/lib/agent/provider-constants";import { parseAgentModelIds } from "@/lib/agent/model-ids";@@ -23,7 +24,7 @@ async function authorize(request: Request) {const env = getEnv();const session = await requireSessionUser(env, request);if (session.error) return { env, error: session.error };- if (session.user.role !== "admin") return { env, error: Response.json({ error: "Forbidden" }, { status: 403 }) };+ if (!isPrimaryAdmin(session.user)) return { env, error: Response.json({ error: "Forbidden" }, { status: 403 }) };return { env, error: null };}diff --git a/src/app/api/admin/ai-usage/utils.ts b/src/app/api/admin/ai-usage/utils.tsindex e322c53..d222aa6 100644--- a/src/app/api/admin/ai-usage/utils.ts+++ b/src/app/api/admin/ai-usage/utils.ts@@ -3,6 +3,7 @@ import { getDb } from "@/db";import { aiUsage } from "@/db/schema";import { getEnv } from "@/lib/cloudflare";import { requireSessionUser } from "@/lib/api/auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { getRequestTimeZone, recentZonedDays } from "@/lib/time/utils";const PAGE_SIZE = 20;@@ -11,7 +12,7 @@ export async function GET(request: Request) {const env = getEnv();const session = await requireSessionUser(env, request);if (session.error) return session.error;- if (session.user.role !== "admin") return Response.json({ error: "Forbidden" }, { status: 403 });+ if (!isPrimaryAdmin(session.user)) return Response.json({ error: "Forbidden" }, { status: 403 });const rawPage = new URL(request.url).searchParams.get("page") ?? "1";const page = Number(rawPage);if (!Number.isSafeInteger(page) || page < 1 || page > Math.floor(Number.MAX_SAFE_INTEGER / PAGE_SIZE)) return Response.json({ error: "Invalid page" }, { status: 400 });diff --git a/src/app/api/admin/api-keys/utils.ts b/src/app/api/admin/api-keys/utils.tsindex df267a3..bb35d9c 100644--- a/src/app/api/admin/api-keys/utils.ts+++ b/src/app/api/admin/api-keys/utils.ts@@ -5,6 +5,7 @@ import { getEnv } from "@/lib/cloudflare";import { getDb } from "@/db";import { agentSendApprovals, apiKeys } from "@/db/schema";import { requireSessionUser } from "@/lib/api/auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { generateApiKey, parseScopes, scopesToJson } from "@/lib/api-keys";import { ADMIN_API_KEY_SCOPES } from "@/lib/api/scopes";import { newId } from "@/lib/ids";@@ -21,7 +22,7 @@ async function authorize(request: Request) {const env = getEnv();const session = await requireSessionUser(env, request);if (session.error) return { env, user: null, error: session.error };- if (session.user.role !== "admin") return { env, user: null, error: NextResponse.json({ error: "Forbidden" }, { status: 403 }) };+ if (!isPrimaryAdmin(session.user)) return { env, user: null, error: NextResponse.json({ error: "Forbidden" }, { status: 403 }) };return { env, user: session.user, error: null };}diff --git a/src/app/api/admin/general/utils.ts b/src/app/api/admin/general/utils.tsindex ef2c482..4cad9ed 100644--- a/src/app/api/admin/general/utils.ts+++ b/src/app/api/admin/general/utils.ts@@ -3,6 +3,7 @@ import { getDb } from "@/db";import { appSettings } from "@/db/schema";import { getEnv } from "@/lib/cloudflare";import { requireSessionUser } from "@/lib/api/auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { hasValidSessionMutationOrigin } from "@/lib/auth/origin";import { getOutboundAttachmentMaxMb, MAX_OUTBOUND_ATTACHMENT_MAX_MB } from "@/lib/email/attachment-policy";@@ -12,7 +13,7 @@ export async function GET(request: Request) {const env = getEnv();const auth = await requireSessionUser(env, request);if (auth.error) return auth.error;- if (auth.user.role !== "admin") return Response.json({ error: "Forbidden" }, { status: 403 });+ if (!isPrimaryAdmin(auth.user)) return Response.json({ error: "Forbidden" }, { status: 403 });return Response.json({ outboundAttachmentMaxMb: await getOutboundAttachmentMaxMb(env) }, { headers: { "Cache-Control": "no-store" } });}@@ -20,7 +21,7 @@ export async function PUT(request: Request) {const env = getEnv();const auth = await requireSessionUser(env, request);if (auth.error) return auth.error;- if (auth.user.role !== "admin") return Response.json({ error: "Forbidden" }, { status: 403 });+ if (!isPrimaryAdmin(auth.user)) return Response.json({ error: "Forbidden" }, { status: 403 });if (!hasValidSessionMutationOrigin(request)) return Response.json({ error: "Invalid origin" }, { status: 403 });const parsed = schema.safeParse(await request.json().catch(() => null));if (!parsed.success) return Response.json({ error: "Choose a whole number from 1 to 25 MB" }, { status: 400 });diff --git a/src/app/api/admin/update/utils.ts b/src/app/api/admin/update/utils.tsindex fb4139f..53ad346 100644--- a/src/app/api/admin/update/utils.ts+++ b/src/app/api/admin/update/utils.ts@@ -1,5 +1,5 @@import { NextResponse } from "next/server";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";import type {@@ -31,7 +31,7 @@ export async function authorizeAdminRequest(request: Request) {}try {- assertAdmin(user);+ assertPrimaryAdmin(user);} catch {return {error: NextResponse.json({ error: "Forbidden" }, { status: 403 }),diff --git a/src/app/api/agent/settings/route.ts b/src/app/api/agent/settings/route.tsindex e19514c..d3059af 100644--- a/src/app/api/agent/settings/route.ts+++ b/src/app/api/agent/settings/route.ts@@ -6,6 +6,7 @@ import { getEnv } from "@/lib/cloudflare";import { getCurrentUser } from "@/lib/auth/cookies";import { getMailboxAccessLevel } from "@/lib/mailboxes/access";import { getAgentProviderPublicConfig } from "@/lib/agent/provider";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { hasValidSessionMutationOrigin } from "@/lib/auth/origin";const schema = z.object({ mailboxId: z.string().min(1), enabled: z.boolean(), modelId: z.string().max(200).nullable().optional(), autoDraftEnabled: z.boolean(), reviewerUserId: z.string().nullable().optional(), instructions: z.string().max(4_000), dailyLimit: z.number().int().min(1).max(100) });@@ -28,7 +29,7 @@ export async function GET(request: Request) {const agentProvider = await getAgentProviderPublicConfig(env);const provider = agentProvider.configured ? { kind: agentProvider.provider === "cloudflare" ? "Cloudflare Workers AI" : agentProvider.preset === "custom" ? "OpenAI-compatible API" : agentProvider.preset, model: agentProvider.model } : null;const modelId = settings?.modelId && agentProvider.models.includes(settings.modelId) ? settings.modelId : agentProvider.models[0] ?? null;- return Response.json({ settings: settings ? { ...settings, enabled: true, modelId } : { mailboxId, enabled: true, modelId, autoDraftEnabled: false, reviewerUserId: access.mailbox.userId, instructions: "", dailyLimit: 25 }, models: agentProvider.models, canManage: access.canManage, canConfigureProvider: user.role === "admin", providerConfigured: agentProvider.configured, provider, autoReplyEnabled: access.mailbox.autoReplyEnabled, reviewers });+ return Response.json({ settings: settings ? { ...settings, enabled: true, modelId } : { mailboxId, enabled: true, modelId, autoDraftEnabled: false, reviewerUserId: access.mailbox.userId, instructions: "", dailyLimit: 25 }, models: agentProvider.models, canManage: access.canManage, canConfigureProvider: isPrimaryAdmin(user), providerConfigured: agentProvider.configured, provider, autoReplyEnabled: access.mailbox.autoReplyEnabled, reviewers });}export async function PUT(request: Request) {diff --git a/src/app/api/audit-logs/route.ts b/src/app/api/audit-logs/route.tsindex 6183dbc..e86adf6 100644--- a/src/app/api/audit-logs/route.ts+++ b/src/app/api/audit-logs/route.ts@@ -3,7 +3,7 @@ import { alias } from "drizzle-orm/sqlite-core";import { NextResponse } from "next/server";import { getDb } from "@/db";import { auditLogs, domains, mailboxes, users } from "@/db/schema";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";@@ -11,7 +11,7 @@ export async function GET(request: Request) {const env = getEnv();const admin = await requireUser(env, request);try {- assertAdmin(admin);+ assertPrimaryAdmin(admin);} catch {return NextResponse.json({ error: "Forbidden" }, { status: 403 });}diff --git a/src/app/api/auth/me/route.ts b/src/app/api/auth/me/route.tsindex ffff900..58ea97f 100644--- a/src/app/api/auth/me/route.ts+++ b/src/app/api/auth/me/route.ts@@ -33,7 +33,10 @@ export async function GET(request: Request) {forwardingEmail: user.forwardingEmail,canForwardEmail: entitlements.canForwardEmail,role: user.role,+ isPrimaryAdmin: user.isPrimaryAdmin,canManageMailboxes: user.canManageMailboxes,+ canManageDomains: user.canManageDomains,+ canManageUsers: user.canManageUsers,keyboardShortcutsEnabled: user.keyboardShortcutsEnabled,spamProtectionEnabled: user.spamProtectionEnabled,hasAvatar: !!user.avatarKey,diff --git a/src/app/api/auth/register/route.ts b/src/app/api/auth/register/route.tsindex f2e7e34..4bd3aa9 100644--- a/src/app/api/auth/register/route.ts+++ b/src/app/api/auth/register/route.ts@@ -60,6 +60,7 @@ export async function POST(request: Request) {passwordHash: hashPassword(password),name,role: "admin",+ isPrimaryAdmin: true,});// Tracks what the attempt changed on the Cloudflare zone so a failure can undodiff --git a/src/app/api/backups/[id]/download/route.ts b/src/app/api/backups/[id]/download/route.tsindex d280e20..2108045 100644--- a/src/app/api/backups/[id]/download/route.ts+++ b/src/app/api/backups/[id]/download/route.ts@@ -2,7 +2,7 @@ import { eq } from "drizzle-orm";import { NextResponse } from "next/server";import { getDb } from "@/db";import { backups } from "@/db/schema";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";@@ -13,7 +13,7 @@ export async function GET(const env = getEnv();try {const user = await requireUser(env, request);- assertAdmin(user);+ assertPrimaryAdmin(user);const { id } = await params;const [backup] = await getDb(env).select().from(backups).where(eq(backups.id, id)).limit(1);if (!backup?.r2Key) return NextResponse.json({ error: "Backup file not found" }, { status: 404 });diff --git a/src/app/api/backups/[id]/route.ts b/src/app/api/backups/[id]/route.tsindex fec64aa..ae644ae 100644--- a/src/app/api/backups/[id]/route.ts+++ b/src/app/api/backups/[id]/route.ts@@ -1,5 +1,5 @@import { NextResponse } from "next/server";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { deleteBackup } from "@/lib/backups/service";import { getEnv } from "@/lib/cloudflare";@@ -11,7 +11,7 @@ export async function DELETE(const env = getEnv();try {const user = await requireUser(env, request);- assertAdmin(user);+ assertPrimaryAdmin(user);const { id } = await params;const deleted = await deleteBackup(env, id);if (!deleted) return NextResponse.json({ error: "Backup not found" }, { status: 404 });diff --git a/src/app/api/backups/restore/route.ts b/src/app/api/backups/restore/route.tsindex bc29e30..24367cd 100644--- a/src/app/api/backups/restore/route.ts+++ b/src/app/api/backups/restore/route.ts@@ -1,5 +1,5 @@import { NextResponse } from "next/server";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { restoreDatabaseRecords } from "@/lib/backups/export";import { getEnv } from "@/lib/cloudflare";@@ -8,7 +8,7 @@ export async function POST(request: Request) {const env = getEnv();try {const user = await requireUser(env, request);- assertAdmin(user);+ assertPrimaryAdmin(user);const form = await request.formData();const file = form.get("backup");if (!(file instanceof File)) return NextResponse.json({ error: "Choose a backup file" }, { status: 400 });diff --git a/src/app/api/backups/route.ts b/src/app/api/backups/route.tsindex d7e2013..dc32bfe 100644--- a/src/app/api/backups/route.ts+++ b/src/app/api/backups/route.ts@@ -1,5 +1,5 @@import { NextResponse } from "next/server";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { getBackupConfigurationStatus } from "@/lib/backups/export";import { runDatabaseBackup } from "@/lib/backups/runner";@@ -15,7 +15,7 @@ import { parseBackupSettingsInput } from "./utils";async function requireAdmin(request: Request) {const env = getEnv();const user = await requireUser(env, request);- assertAdmin(user);+ assertPrimaryAdmin(user);return { env, user };}diff --git a/src/app/api/branding/route.ts b/src/app/api/branding/route.tsindex 6864e88..2bf439c 100644--- a/src/app/api/branding/route.ts+++ b/src/app/api/branding/route.ts@@ -1,5 +1,5 @@import { NextResponse } from "next/server";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import { getBranding, updateBranding } from "@/lib/branding/service";import { getEnv } from "@/lib/cloudflare";@@ -14,7 +14,7 @@ export async function GET() {export async function PUT(request: Request) {const env = getEnv();try {- assertAdmin(await requireUser(env, request));+ assertPrimaryAdmin(await requireUser(env, request));} catch {return NextResponse.json({ error: "Forbidden" }, { status: 403 });}diff --git a/src/app/api/domains/[id]/dns/setup/route.ts b/src/app/api/domains/[id]/dns/setup/route.tsindex 377a703..11c6fef 100644--- a/src/app/api/domains/[id]/dns/setup/route.ts+++ b/src/app/api/domains/[id]/dns/setup/route.ts@@ -4,6 +4,7 @@ import { getEnv } from "@/lib/cloudflare";import { getDb } from "@/db";import { domains } from "@/db/schema";import { requireUser } from "@/lib/auth/cookies";+import { canManageDomains } from "@/lib/auth/admin";import { getDomainForUser } from "@/lib/domains/service";import { getDomainDnsView } from "@/lib/domains/dns-view";import type { DnsAuthRecord } from "@/lib/domains/dns-audit";@@ -18,7 +19,7 @@ export async function POST(request: Request, { params }: Params) {const { id } = await params;const env = getEnv();const user = await requireUser(env, request);- if (user.role !== "admin") return NextResponse.json({ error: "Forbidden" }, { status: 403 });+ if (!canManageDomains(user)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });if (!hasValidSessionMutationOrigin(request)) return NextResponse.json({ error: "Invalid origin" }, { status: 403 });const domain = await getDomainForUser(env, user.id, id);if (!domain) return NextResponse.json({ error: "Not found" }, { status: 404 });diff --git a/src/app/api/domains/[id]/route.ts b/src/app/api/domains/[id]/route.tsindex f2d8eec..2765f92 100644--- a/src/app/api/domains/[id]/route.ts+++ b/src/app/api/domains/[id]/route.ts@@ -1,6 +1,7 @@import { NextResponse } from "next/server";import { getEnv } from "@/lib/cloudflare";import { requireUser } from "@/lib/auth/cookies";+import { canManageDomains } from "@/lib/auth/admin";import { getDomainForUser, removeDomainForUser } from "@/lib/domains/service";import { hasValidSessionMutationOrigin } from "@/lib/auth/origin";@@ -19,7 +20,7 @@ export async function DELETE(request: Request, { params }: Params) {const { id } = await params;const env = getEnv();const user = await requireUser(env, request);- if (user.role !== "admin") return NextResponse.json({ error: "Forbidden" }, { status: 403 });+ if (!canManageDomains(user)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });if (!hasValidSessionMutationOrigin(request)) return NextResponse.json({ error: "Invalid origin" }, { status: 403 });try {await removeDomainForUser(env, user.id, id);diff --git a/src/app/api/domains/route.ts b/src/app/api/domains/route.tsindex 6b844ce..66ece4e 100644--- a/src/app/api/domains/route.ts+++ b/src/app/api/domains/route.ts@@ -1,6 +1,7 @@import { NextRequest, NextResponse } from "next/server";import { getEnv } from "@/lib/cloudflare";import { requireUser } from "@/lib/auth/cookies";+import { canManageDomains } from "@/lib/auth/admin";import { addDomainSchema } from "@/lib/validators";import { addDomainForUser, listUserDomains } from "@/lib/domains/service";import type { DnsStatusSummary } from "@/lib/dns-status";@@ -44,7 +45,7 @@ export async function GET(request: NextRequest) {export async function POST(request: Request) {const env = getEnv();const user = await requireUser(env, request);- if (user.role !== "admin") return NextResponse.json({ error: "Forbidden" }, { status: 403 });+ if (!canManageDomains(user)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });if (!hasValidSessionMutationOrigin(request)) return NextResponse.json({ error: "Invalid origin" }, { status: 403 });const parsed = addDomainSchema.safeParse(await request.json());if (!parsed.success) {diff --git a/src/app/api/licenses/utils.ts b/src/app/api/licenses/utils.tsindex 9f14252..3a043c1 100644--- a/src/app/api/licenses/utils.ts+++ b/src/app/api/licenses/utils.ts@@ -1,6 +1,6 @@import { NextResponse } from "next/server";import { z } from "zod";-import { assertAdmin } from "@/lib/auth/admin";+import { assertPrimaryAdmin } from "@/lib/auth/admin";import { requireUser } from "@/lib/auth/cookies";import type { LicenseKeyRequest } from "./types";@@ -11,7 +11,7 @@ const licenseKeySchema = z.object({export async function requireLicenseAdmin(env: CloudflareEnv, request: Request): Promise<NextResponse | null> {try {- assertAdmin(await requireUser(env, request));+ assertPrimaryAdmin(await requireUser(env, request));return null;} catch {return NextResponse.json({ error: "Forbidden" }, { status: 403 });diff --git a/src/app/api/v1/accounts/[id]/utils.ts b/src/app/api/v1/accounts/[id]/utils.tsindex 3a51032..a3e8119 100644--- a/src/app/api/v1/accounts/[id]/utils.ts+++ b/src/app/api/v1/accounts/[id]/utils.ts@@ -4,6 +4,7 @@ import { getEnv } from "@/lib/cloudflare";import { getDb } from "@/db";import { users } from "@/db/schema";import { authenticateAdminApiKey, canManageAdminAccounts } from "@/lib/api/admin-auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { updateManagedAccountSchema } from "@/lib/validators";import { getLicenseEntitlements } from "@/lib/licenses/service";import { selectAccountById, updateAccountCredentials } from "@/app/api/accounts/[id]/utils";@@ -36,14 +37,19 @@ export async function PATCH(request: Request, { params }: AdminAccountRouteParamif (!account || (account.id !== auth.userId && account.createdByUserId !== auth.userId)) return NextResponse.json({ error: "Account not found" }, { status: 404 });const parsed = updateManagedAccountSchema.safeParse(await request.json().catch(() => null));if (!parsed.success) return NextResponse.json({ error: parsed.error.flatten() }, { status: 400 });+ if (!isPrimaryAdmin(auth.user) && (account.isPrimaryAdmin || account.role === "admin" || parsed.data.role !== account.role)) {+ return NextResponse.json({ error: "Only the primary admin can manage admin accounts" }, { status: 403 });+ }const canForwardEmail = (await getLicenseEntitlements(env)).canForwardEmail;if (!canForwardEmail && parsed.data.forwardingEmail && parsed.data.forwardingEmail !== account.forwardingEmail) return NextResponse.json({ error: "A Pro or Team license is required for email forwarding" }, { status: 403 });await updateAccountCredentials(db, id, { name: parsed.data.name, password: parsed.data.password ?? null });if (parsed.data.password) await deleteUserSessions(env, id);await db.update(users).set({- role: parsed.data.role,- disabled: parsed.data.disabled,+ role: account.isPrimaryAdmin ? "admin" : parsed.data.role,+ disabled: account.isPrimaryAdmin ? false : parsed.data.disabled,canManageMailboxes: parsed.data.canManageMailboxes,+ ...(isPrimaryAdmin(auth.user) && parsed.data.canManageDomains !== undefined ? { canManageDomains: parsed.data.canManageDomains } : {}),+ ...(isPrimaryAdmin(auth.user) && parsed.data.canManageUsers !== undefined ? { canManageUsers: parsed.data.canManageUsers } : {}),...(parsed.data.forwardingEmail !== undefined ? { forwardingEmail: parsed.data.forwardingEmail } : {}),}).where(eq(users.id, id));return NextResponse.json({ ok: true });diff --git a/src/app/api/v1/accounts/utils.ts b/src/app/api/v1/accounts/utils.tsindex 540c624..bd05b07 100644--- a/src/app/api/v1/accounts/utils.ts+++ b/src/app/api/v1/accounts/utils.ts@@ -4,6 +4,7 @@ import { getEnv } from "@/lib/cloudflare";import { getDb } from "@/db";import { users } from "@/db/schema";import { authenticateAdminApiKey, canManageAdminAccounts } from "@/lib/api/admin-auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { createUserAccountSchema } from "@/lib/validators";import { accountListItemFromUser } from "@/app/api/accounts/utils";import { createAccountResponse } from "@/app/api/accounts/create";@@ -24,5 +25,8 @@ export async function POST(request: Request) {if (!(await canManageAdminAccounts(env))) return NextResponse.json({ error: "A Team license is required to manage accounts" }, { status: 403 });const parsed = createUserAccountSchema.safeParse(await request.json().catch(() => null));if (!parsed.success) return NextResponse.json({ error: parsed.error.flatten() }, { status: 400 });+ if (parsed.data.role === "admin" && !isPrimaryAdmin(auth.user)) {+ return NextResponse.json({ error: "Only the primary admin can create admin accounts" }, { status: 403 });+ }return createAccountResponse(env, auth.userId, parsed.data);}diff --git a/src/app/api/webhooks/[id]/utils.ts b/src/app/api/webhooks/[id]/utils.tsindex c29efb4..ac26241 100644--- a/src/app/api/webhooks/[id]/utils.ts+++ b/src/app/api/webhooks/[id]/utils.ts@@ -3,6 +3,7 @@ import { NextResponse } from "next/server";import { getDb } from "@/db";import { webhooks } from "@/db/schema";import { requireSessionUser } from "@/lib/api/auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { getEnv } from "@/lib/cloudflare";/** Loads a webhook owned by the caller, or the 404 response to return instead. */@@ -11,6 +12,7 @@ export async function loadOwnedWebhook(request: Request, id: string) {const auth = await requireSessionUser(env, request);if (auth.error) return { error: auth.error } as const;const user = auth.user;+ if (!isPrimaryAdmin(user)) return { error: NextResponse.json({ error: "Forbidden" }, { status: 403 }) } as const;const db = getDb(env);const [hook] = await db.select()diff --git a/src/app/api/webhooks/route.ts b/src/app/api/webhooks/route.tsindex 8279311..dc0cee8 100644--- a/src/app/api/webhooks/route.ts+++ b/src/app/api/webhooks/route.ts@@ -6,6 +6,7 @@ import { webhookDeliveries, webhooks } from "@/db/schema";import { parseWebhookEvents } from "@/lib/email/webhooks";import { summariseDeliveryStats } from "./utils";import { requireSessionUser } from "@/lib/api/auth";+import { isPrimaryAdmin } from "@/lib/auth/admin";import { newId } from "@/lib/ids";import { webhookSchema } from "@/lib/validators";import { readJsonBody } from "@/lib/http/request";@@ -17,6 +18,7 @@ export async function GET(request: Request) {const auth = await requireSessionUser(env, request);if (auth.error) return auth.error;const user = auth.user;+ if (!isPrimaryAdmin(user)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });const db = getDb(env);const rows = await db.select()@@ -54,6 +56,7 @@ export async function POST(request: Request) {const auth = await requireSessionUser(env, request);if (auth.error) return auth.error;const user = auth.user;+ if (!isPrimaryAdmin(user)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });if (!hasValidSessionMutationOrigin(request)) return NextResponse.json({ error: "Invalid origin" }, { status: 403 });let body: unknown;try {diff --git a/src/components/admin-nav.tsx b/src/components/admin-nav.tsxindex 8de3311..cca0d2f 100644--- a/src/components/admin-nav.tsx+++ b/src/components/admin-nav.tsx@@ -15,13 +15,23 @@ import {Bot,} from "lucide-react";import { cn } from "@/lib/utils";+import { useCurrentUser } from "@/hooks/use-current-user";import { NavItem } from "./components-nav";import { SidebarFooter } from "./sidebar-footer";import { useBranding } from "./branding-provider";import { SidebarHeader } from "./sidebar-header";import { useSidebar } from "./sidebar-state";-const sections = [+type AdminLinkPermission = "primary" | "domains" | "users";++type AdminNavLink = {+ href: string;+ label: string;+ icon: typeof Settings;+ permission?: AdminLinkPermission;+};++const sections: { label?: string; links: AdminNavLink[] }[] = [{// label: "Overview",links: [{ href: "/admin", label: "Overview", icon: Settings }],@@ -30,27 +40,27 @@ const sections = [label: "Email",links: [{ href: "/mailboxes", label: "Mailboxes", icon: Mail },- { href: "/domains", label: "Domains", icon: Globe2 },+ { href: "/domains", label: "Domains", icon: Globe2, permission: "domains" },{ href: "/routing", label: "Routing", icon: Route },- { href: "/webhooks", label: "Webhooks", icon: Webhook },+ { href: "/webhooks", label: "Webhooks", icon: Webhook, permission: "primary" },],},{label: "Administration",links: [- { href: "/api-keys", label: "API keys", icon: KeyRound },- { href: "/general", label: "General", icon: Settings },- { href: "/agent", label: "Agent", icon: Bot },+ { href: "/api-keys", label: "API keys", icon: KeyRound, permission: "primary" },+ { href: "/general", label: "General", icon: Settings, permission: "primary" },+ { href: "/agent", label: "Agent", icon: Bot, permission: "primary" },{ href: "/accounts", label: "Accounts", icon: Users },- { href: "/activity", label: "Activity", icon: Activity },- { href: "/backups", label: "Backups", icon: DatabaseBackup },+ { href: "/activity", label: "Activity", icon: Activity, permission: "primary" },+ { href: "/backups", label: "Backups", icon: DatabaseBackup, permission: "primary" },],},{label: "Product",links: [- { href: "/branding", label: "Branding", icon: Palette },- { href: "/licenses", label: "Licenses", icon: BadgeDollarSign },+ { href: "/branding", label: "Branding", icon: Palette, permission: "primary" },+ { href: "/licenses", label: "Licenses", icon: BadgeDollarSign, permission: "primary" },],},];@@ -58,16 +68,23 @@ const sections = [export function AdminNav({ className }: { className?: string }) {const branding = useBranding();const { minimal } = useSidebar();+ const user = useCurrentUser();++ function canSee(link: AdminNavLink): boolean {+ if (link.href === "/branding" && !branding.canCustomizeBranding) return false;+ if (!link.permission) return true;+ if (!user) return false;+ if (link.permission === "primary") return user.isPrimaryAdmin;+ if (link.permission === "domains") return user.isPrimaryAdmin || user.canManageDomains;+ return user.isPrimaryAdmin || user.canManageUsers;+ }return (<nav className={cn("flex min-h-full flex-col gap-1", className)}><SidebarHeader href="/inbox" label="Admin" /><div className={cn("space-y-4", minimal && "space-y-2 pl-1")}>{sections.map((section, sectionIndex) => {- const links = section.links.filter(- (link) =>- link.href !== "/branding" || branding.canCustomizeBranding,- );+ const links = section.links.filter(canSee);if (links.length === 0) return null;return (diff --git a/src/components/auth/auth-guard-types.d.ts b/src/components/auth/auth-guard-types.d.tsindex ed46fcb..6cdf980 100644--- a/src/components/auth/auth-guard-types.d.ts+++ b/src/components/auth/auth-guard-types.d.ts@@ -7,4 +7,5 @@ export type AuthGuardProps = {mode?: AuthGuardMode;requireMailbox?: boolean;requireRole?: "admin";+ requirePrimary?: boolean;};diff --git a/src/components/auth/auth-guard.tsx b/src/components/auth/auth-guard.tsxindex 9663043..299b1df 100644--- a/src/components/auth/auth-guard.tsx+++ b/src/components/auth/auth-guard.tsx@@ -7,7 +7,7 @@ import type { AuthGuardProps } from "./auth-guard-types";import { LoadingTransition } from "@/components/loading-transition";import { saveUserTimeZonePreference } from "@/lib/time/client";-export function AuthGuard({ children, mode = "protected", requireMailbox, requireRole }: AuthGuardProps) {+export function AuthGuard({ children, mode = "protected", requireMailbox, requireRole, requirePrimary }: AuthGuardProps) {const pathname = usePathname();const router = useRouter();const [authorized, setAuthorized] = useState(mode === "public");@@ -35,7 +35,7 @@ export function AuthGuard({ children, mode = "protected", requireMailbox, requirreturn;}- const data = (await response.json()) as { hasMailboxes?: boolean; isSetup?: boolean; user?: { id?: string; role?: string; timeZone?: string | null } };+ const data = (await response.json()) as { hasMailboxes?: boolean; isSetup?: boolean; user?: { id?: string; role?: string; isPrimaryAdmin?: boolean; timeZone?: string | null } };if (data.user?.id) saveUserTimeZonePreference(data.user.id, data.user.timeZone ?? null);if (mode === "public") {router.replace("/inbox");@@ -57,6 +57,11 @@ export function AuthGuard({ children, mode = "protected", requireMailbox, requirreturn;}+ if (requirePrimary && !data.user?.isPrimaryAdmin) {+ router.replace("/admin");+ return;+ }+setAuthorized(true);} catch {if (!cancelled) setAuthorized(true);@@ -68,7 +73,7 @@ export function AuthGuard({ children, mode = "protected", requireMailbox, requirreturn () => {cancelled = true;};- }, [mode, pathname, requireMailbox, requireRole, router]);+ }, [mode, pathname, requireMailbox, requireRole, requirePrimary, router]);useEffect(() => {const refreshTimeZone = (event: StorageEvent) => {diff --git a/src/components/providers.tsx b/src/components/providers.tsxindex 2bdca9d..106701b 100644--- a/src/components/providers.tsx+++ b/src/components/providers.tsx@@ -9,6 +9,7 @@ import { ThemeSync } from "@/components/theme-sync";import { useMessagePolling } from "@/hooks/use-message-polling";import { clearMessageClientState } from "@/hooks/utils";import { clearMessageDetailCache } from "@/lib/messages/detail-cache";+import { clearCurrentUserCache } from "@/hooks/use-current-user";import { AUTH_SESSION_CHANGED_EVENT } from "@/lib/auth/client";export function Providers({ children }: { children: React.ReactNode }) {@@ -34,6 +35,7 @@ export function Providers({ children }: { children: React.ReactNode }) {clearMailboxClientState();clearMessageClientState();clearMessageDetailCache();+ clearCurrentUserCache();}window.addEventListener(AUTH_SESSION_CHANGED_EVENT, resetUserScopedState);diff --git a/src/db/schema/index.ts b/src/db/schema/index.tsindex 0f46f94..6947522 100644--- a/src/db/schema/index.ts+++ b/src/db/schema/index.ts@@ -13,8 +13,14 @@ export const users = sqliteTable("users", {timeZone: text("time_zone"),avatarKey: text("avatar_key"),role: text("role", { enum: ["admin", "user"] }).notNull().default("user"),+ // Exactly one account is the primary admin: the one created during setup.+ // They own administrator management and can hand the role to another account.+ isPrimaryAdmin: integer("is_primary_admin", { mode: "boolean" }).notNull().default(false),disabled: integer("disabled", { mode: "boolean" }).notNull().default(false),canManageMailboxes: integer("can_manage_mailboxes", { mode: "boolean" }).notNull().default(false),+ // Capabilities the primary admin grants to other admins.+ canManageDomains: integer("can_manage_domains", { mode: "boolean" }).notNull().default(false),+ canManageUsers: integer("can_manage_users", { mode: "boolean" }).notNull().default(false),keyboardShortcutsEnabled: integer("keyboard_shortcuts_enabled", { mode: "boolean" }).notNull().default(true),spamProtectionEnabled: integer("spam_protection_enabled", { mode: "boolean" }).notNull().default(true),// TOTP second factor. The secret is written at enrolment and only countsdiff --git a/src/hooks/use-current-user.ts b/src/hooks/use-current-user.tsnew file mode 100644index 0000000..d5213d3--- /dev/null+++ b/src/hooks/use-current-user.ts@@ -0,0 +1,68 @@+"use client";++import { useEffect, useState } from "react";+import { AUTH_SESSION_CHANGED_EVENT, authFetch } from "@/lib/auth/client";++export type CurrentUser = {+ id: string;+ email: string;+ name: string;+ role: "admin" | "user";+ isPrimaryAdmin: boolean;+ canManageMailboxes: boolean;+ canManageDomains: boolean;+ canManageUsers: boolean;+ hasAvatar: boolean;+};++let cachedUser: CurrentUser | null = null;+let inflight: Promise<CurrentUser | null> | null = null;++export function clearCurrentUserCache(): void {+ cachedUser = null;+ inflight = null;+}++export function fetchCurrentUser(): Promise<CurrentUser | null> {+ if (cachedUser) return Promise.resolve(cachedUser);+ if (!inflight) {+ inflight = authFetch("/api/auth/me", { redirectOnUnauthorized: false })+ .then((response) => (response.ok ? response.json() : null))+ .then((data) => {+ cachedUser = (data as { user?: CurrentUser } | null)?.user ?? null;+ return cachedUser;+ })+ .catch(() => null)+ .finally(() => {+ inflight = null;+ });+ }+ return inflight;+}++export function useCurrentUser(): CurrentUser | null {+ const [user, setUser] = useState<CurrentUser | null>(cachedUser);+ const [reloadKey, setReloadKey] = useState(0);++ useEffect(() => {+ let active = true;+ void fetchCurrentUser().then((next) => {+ if (active) setUser(next);+ });+ return () => {+ active = false;+ };+ }, [reloadKey]);++ // Login and logout swap the cached account without a reload, so refetch when the session changes.+ useEffect(() => {+ function onSessionChanged() {+ clearCurrentUserCache();+ setReloadKey((key) => key + 1);+ }+ window.addEventListener(AUTH_SESSION_CHANGED_EVENT, onSessionChanged);+ return () => window.removeEventListener(AUTH_SESSION_CHANGED_EVENT, onSessionChanged);+ }, []);++ return user;+}diff --git a/src/lib/auth/admin.ts b/src/lib/auth/admin.tsindex bb1c1bf..687b997 100644--- a/src/lib/auth/admin.ts+++ b/src/lib/auth/admin.ts@@ -9,3 +9,35 @@ export function assertAdmin(user: Pick<SessionUser, "role">): void {throw new Error("Forbidden");}}++/**+ * The primary admin is the single account created during setup. Only it can+ * manage other admins and reach owner-only administration pages.+ */+export function isPrimaryAdmin(+ user: Pick<SessionUser, "role" | "isPrimaryAdmin">,+): boolean {+ return user.role === "admin" && user.isPrimaryAdmin;+}++export function assertPrimaryAdmin(+ user: Pick<SessionUser, "role" | "isPrimaryAdmin">,+): void {+ if (!isPrimaryAdmin(user)) {+ throw new Error("Forbidden");+ }+}++/** Domains can be managed by the primary admin or an admin the primary granted it to. */+export function canManageDomains(+ user: Pick<SessionUser, "role" | "isPrimaryAdmin" | "canManageDomains">,+): boolean {+ return isPrimaryAdmin(user) || (user.role === "admin" && user.canManageDomains);+}++/** User accounts can be managed by the primary admin or an admin the primary granted it to. */+export function canManageUsers(+ user: Pick<SessionUser, "role" | "isPrimaryAdmin" | "canManageUsers">,+): boolean {+ return isPrimaryAdmin(user) || (user.role === "admin" && user.canManageUsers);+}diff --git a/src/lib/auth/types.d.ts b/src/lib/auth/types.d.tsindex 052628a..45ca6f2 100644--- a/src/lib/auth/types.d.ts+++ b/src/lib/auth/types.d.ts@@ -9,8 +9,11 @@ export type SessionUser = {name: string;timeZone: string | null;role: UserRole;+ isPrimaryAdmin: boolean;disabled: boolean;canManageMailboxes: boolean;+ canManageDomains: boolean;+ canManageUsers: boolean;keyboardShortcutsEnabled: boolean;spamProtectionEnabled: boolean;createdByUserId: string | null;diff --git a/src/lib/validators.ts b/src/lib/validators.tsindex 3214433..7a19200 100644--- a/src/lib/validators.ts+++ b/src/lib/validators.ts@@ -123,6 +123,8 @@ export const updateManagedAccountSchema = z.object({role: z.enum(["admin", "user"]),disabled: z.boolean(),canManageMailboxes: z.boolean(),+ canManageDomains: z.boolean().optional(),+ canManageUsers: z.boolean().optional(),forwardingEmail: z.preprocess((value) => (typeof value === "string" ? value.trim() : value),z.string().email().or(z.literal("")).nullable().optional().transform((value) => value === undefined ? undefined : value || null),