Email for professionals and teams
add routing page to admin
Hieu Nguyen (Jack)c7f263c0eb19
diff --git a/src/app/(admin)/admin/page.tsx b/src/app/(admin)/admin/page.tsxindex 5a7ac83..8811c8d 100644--- a/src/app/(admin)/admin/page.tsx+++ b/src/app/(admin)/admin/page.tsx@@ -47,7 +47,7 @@ const sections = [// icon: Webhook,// },// {- // href: "/settings",+ // href: "/settings/account",// title: "Account",// description: "View personal account and platform configuration.",// icon: Settings,diff --git a/src/app/(admin)/domains/domain-dns-details-utils.ts b/src/app/(admin)/domains/domain-dns-details-utils.tsnew file mode 100644index 0000000..c2f6a6f--- /dev/null+++ b/src/app/(admin)/domains/domain-dns-details-utils.ts@@ -0,0 +1,8 @@+import type { DnsRecord } from "./types";++export function getDnsRecordLabel(record: DnsRecord): string {+ const recordName = record.name || "Domain";+ const destination = record.content ? ` → ${record.content}` : "";+ const priority = record.priority === undefined ? "" : ` (priority ${record.priority})`;+ return `${record.type || "DNS"} · ${recordName}${destination}${priority}`;+}diff --git a/src/app/(admin)/routing/page.tsx b/src/app/(admin)/routing/page.tsxindex 89d111d..9cd1e2c 100644--- a/src/app/(admin)/routing/page.tsx+++ b/src/app/(admin)/routing/page.tsx@@ -1,5 +1,63 @@-import { redirect } from "next/navigation";+"use client";++import { useState } from "react";+import { useQuery } from "@tanstack/react-query";+import { DomainRouting } from "@/components/settings/domain-routing/domain-routing";+import { RoutingRuleSelect } from "@/components/settings/domain-routing/routing-rule-select";+import { Label } from "@/components/ui/label";+import { Skeleton } from "@/components/ui/skeleton";+import { fetchAdminRoutingDomains } from "./utils";export default function RoutingPage() {- redirect("/settings/rules");+ const [domainId, setDomainId] = useState("");+ const domains = useQuery({+ queryKey: ["admin-routing-domains"],+ queryFn: fetchAdminRoutingDomains,+ });+ const availableDomains = domains.data?.domains ?? [];+ const selectedDomain = availableDomains.find((domain) => domain.id === domainId) ?? availableDomains[0];++ return (+ <div className="space-y-8">+ <div>+ <h1 className="text-3xl font-medium text-neutral-900">Routing</h1>+ <p className="mt-1 text-sm text-neutral-500">+ Configure domain-wide delivery, forwarding, and blocking rules.+ </p>+ </div>++ <section className="space-y-4">+ <div>+ <h2 className="text-xl font-semibold text-neutral-900">Domain</h2>+ <p className="mt-1 text-sm text-neutral-500">Choose which domain these global rules apply to.</p>+ </div>+ <div className="rounded-3xl bg-white p-6">+ {domains.isLoading ? (+ <Skeleton className="h-10 w-full" />+ ) : domains.isError ? (+ <p className="text-sm text-red-600">{domains.error.message}</p>+ ) : availableDomains.length === 0 ? (+ <p className="text-sm text-neutral-500">Add a domain before configuring routing rules.</p>+ ) : (+ <div className="grid gap-2">+ <Label htmlFor="routing-domain">Managed domain</Label>+ <RoutingRuleSelect+ id="routing-domain"+ value={selectedDomain?.id ?? ""}+ onChange={(event) => setDomainId(event.target.value)}+ >+ {availableDomains.map((domain) => (+ <option key={domain.id} value={domain.id}>+ {domain.hostname}+ </option>+ ))}+ </RoutingRuleSelect>+ </div>+ )}+ </div>+ </section>++ {selectedDomain && <DomainRouting key={selectedDomain.id} domain={selectedDomain} />}+ </div>+ );}diff --git a/src/app/(admin)/routing/types.d.ts b/src/app/(admin)/routing/types.d.tsnew file mode 100644index 0000000..2e6334b--- /dev/null+++ b/src/app/(admin)/routing/types.d.ts@@ -0,0 +1,10 @@+export type AdminRoutingDomain = {+ id: string;+ hostname: string;+ status: string;+ routingEnabled: boolean;+};++export type AdminRoutingDomainsResponse = {+ domains: AdminRoutingDomain[];+};diff --git a/src/app/(admin)/routing/utils.ts b/src/app/(admin)/routing/utils.tsnew file mode 100644index 0000000..e7d16a3--- /dev/null+++ b/src/app/(admin)/routing/utils.ts@@ -0,0 +1,9 @@+import { authFetch } from "@/lib/auth/client";+import type { AdminRoutingDomainsResponse } from "./types";++export async function fetchAdminRoutingDomains(): Promise<AdminRoutingDomainsResponse> {+ const response = await authFetch("/api/domains");+ const data = (await response.json()) as AdminRoutingDomainsResponse & { error?: string };+ if (!response.ok) throw new Error(data.error ?? "Unable to load domains");+ return { domains: data.domains ?? [] };+}diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsxindex 3608181..24f82b8 100644--- a/src/app/(dashboard)/layout.tsx+++ b/src/app/(dashboard)/layout.tsx@@ -32,7 +32,7 @@ export default function DashboardLayout({<header className="flex h-16 w-full shrink-0 items-center gap-4 pr-4 text-sm"><MailSearchInput /><Link- href="/settings"+ href="/settings/account"className="flex h-10 w-10 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200"><HelpCircle className="h-5 w-5" />diff --git a/src/app/(dashboard)/rules/page.tsx b/src/app/(dashboard)/rules/page.tsxindex dec0ad4..b174e0e 100644--- a/src/app/(dashboard)/rules/page.tsx+++ b/src/app/(dashboard)/rules/page.tsx@@ -1,5 +1,5 @@import { redirect } from "next/navigation";export default function RulesPage() {- redirect("/settings");+ redirect("/settings/account");}diff --git a/src/app/(settings)/layout.tsx b/src/app/(settings)/layout.tsxindex e1f45e8..e66d4ce 100644--- a/src/app/(settings)/layout.tsx+++ b/src/app/(settings)/layout.tsx@@ -32,7 +32,7 @@ export default function DashboardLayout({<header className="flex h-16 w-full shrink-0 items-center gap-4 pr-4 text-sm"><MailSearchInput /><Link- href="/settings"+ href="/settings/account"className="flex h-10 w-10 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200"><HelpCircle className="h-5 w-5" />diff --git a/src/app/api/routing-rules/domain/[id]/route.ts b/src/app/api/routing-rules/domain/[id]/route.tsindex 1c15df0..3312968 100644--- a/src/app/api/routing-rules/domain/[id]/route.ts+++ b/src/app/api/routing-rules/domain/[id]/route.ts@@ -7,6 +7,8 @@ import { getEnv } from "@/lib/cloudflare";import { domainRoutingRuleSchema } from "@/lib/validators";import {assertRuleMailbox,+ assertAdminRuleMailbox,+ getAdminDomain,getManagedDomainMailbox,toRuleColumns,} from "@/lib/domains/routing-rules";@@ -29,11 +31,12 @@ async function loadRule(request: Request, id: string) {}const mailboxId = new URL(request.url).searchParams.get("mailboxId");- if (!mailboxId || !(await getManagedDomainMailbox(db, user, mailboxId, rule.domainId))) {- return { error: NextResponse.json({ error: "Mailbox access is required" }, { status: 403 }) } as const;+ const adminDomain = !mailboxId ? await getAdminDomain(db, user, rule.domainId) : null;+ if (!adminDomain && (!mailboxId || !(await getManagedDomainMailbox(db, user, mailboxId, rule.domainId)))) {+ return { error: NextResponse.json({ error: "Domain or mailbox access is required" }, { status: 403 }) } as const;}- return { env, db, user, rule, error: null } as const;+ return { env, db, user, rule, adminDomain, error: null } as const;}export async function PATCH(request: Request, { params }: DomainRoutingRuleRouteParams) {@@ -48,7 +51,12 @@ export async function PATCH(request: Request, { params }: DomainRoutingRuleRoutereturn NextResponse.json({ error: parsed.error.flatten() }, { status: 400 });}- if (parsed.data.mailboxId && !(await assertRuleMailbox(loaded.db, loaded.user, parsed.data.mailboxId, loaded.rule.domainId))) {+ const destinationAllowed = parsed.data.mailboxId+ ? loaded.adminDomain+ ? await assertAdminRuleMailbox(loaded.db, parsed.data.mailboxId, loaded.rule.domainId)+ : await assertRuleMailbox(loaded.db, loaded.user, parsed.data.mailboxId, loaded.rule.domainId)+ : true;+ if (!destinationAllowed) {return NextResponse.json({ error: "Mailbox access is required for the destination" }, { status: 403 });}diff --git a/src/app/api/routing-rules/domain/route.ts b/src/app/api/routing-rules/domain/route.tsindex 5d61bdd..20b99dc 100644--- a/src/app/api/routing-rules/domain/route.ts+++ b/src/app/api/routing-rules/domain/route.ts@@ -7,7 +7,10 @@ import { newId } from "@/lib/ids";import { domainRoutingRuleSchema } from "@/lib/validators";import {assertRuleMailbox,+ assertAdminRuleMailbox,+ getAdminDomain,getManagedDomainMailbox,+ listAdminDomainMailboxes,listManagedDomainMailboxes,listDomainRules,toRuleColumns,@@ -21,18 +24,21 @@ export async function GET(request: Request) {const searchParams = new URL(request.url).searchParams;const domainId = searchParams.get("domainId");const mailboxId = searchParams.get("mailboxId");- if (!domainId || !mailboxId) {- return NextResponse.json({ error: "domainId and mailboxId are required" }, { status: 400 });+ if (!domainId) {+ return NextResponse.json({ error: "domainId is required" }, { status: 400 });}const db = getDb(env);- if (!(await getManagedDomainMailbox(db, user, mailboxId, domainId))) {- return NextResponse.json({ error: "Mailbox access is required" }, { status: 403 });+ const adminDomain = !mailboxId ? await getAdminDomain(db, user, domainId) : null;+ if (!adminDomain && (!mailboxId || !(await getManagedDomainMailbox(db, user, mailboxId, domainId)))) {+ return NextResponse.json({ error: "Domain or mailbox access is required" }, { status: 403 });}return NextResponse.json({rules: await listDomainRules(db, domainId),- mailboxes: await listManagedDomainMailboxes(db, user, domainId),+ mailboxes: adminDomain+ ? await listAdminDomainMailboxes(db, domainId)+ : await listManagedDomainMailboxes(db, user, domainId),});}@@ -48,11 +54,17 @@ export async function POST(request: Request) {const db = getDb(env);const mailboxId = new URL(request.url).searchParams.get("mailboxId");- if (!mailboxId || !(await getManagedDomainMailbox(db, user, mailboxId, parsed.data.domainId))) {- return NextResponse.json({ error: "Mailbox access is required" }, { status: 403 });+ const adminDomain = !mailboxId ? await getAdminDomain(db, user, parsed.data.domainId) : null;+ if (!adminDomain && (!mailboxId || !(await getManagedDomainMailbox(db, user, mailboxId, parsed.data.domainId)))) {+ return NextResponse.json({ error: "Domain or mailbox access is required" }, { status: 403 });}- if (parsed.data.mailboxId && !(await assertRuleMailbox(db, user, parsed.data.mailboxId, parsed.data.domainId))) {+ const destinationAllowed = parsed.data.mailboxId+ ? adminDomain+ ? await assertAdminRuleMailbox(db, parsed.data.mailboxId, parsed.data.domainId)+ : await assertRuleMailbox(db, user, parsed.data.mailboxId, parsed.data.domainId)+ : true;+ if (!destinationAllowed) {return NextResponse.json({ error: "Mailbox access is required for the destination" }, { status: 403 });}diff --git a/src/components/admin-nav.tsx b/src/components/admin-nav.tsxindex 5943066..4114267 100644--- a/src/components/admin-nav.tsx+++ b/src/components/admin-nav.tsx@@ -29,6 +29,7 @@ const sections = [links: [{ href: "/mailboxes", label: "Mailboxes", icon: Mail },{ href: "/domains", label: "Domains", icon: Globe2 },+ { href: "/routing", label: "Routing", icon: Route },{ href: "/webhooks", label: "Webhooks", icon: Webhook },],},diff --git a/src/components/mailbox-selector.tsx b/src/components/mailbox-selector.tsxindex 3aecebe..f21b1d7 100644--- a/src/components/mailbox-selector.tsx+++ b/src/components/mailbox-selector.tsx@@ -244,7 +244,7 @@ export function MailboxSelector() {Calendar</Link><Link- href="/settings"+ href="/settings/account"onClick={() => setOpen(false)}className="mt-1 flex items-center gap-3 rounded-xl px-3 py-2 text-sm font-medium text-neutral-700 hover:bg-[#f2f6fc]">diff --git a/src/components/settings/domain-routing/domain-routing.tsx b/src/components/settings/domain-routing/domain-routing.tsxindex eab2564..1a481e8 100644--- a/src/components/settings/domain-routing/domain-routing.tsx+++ b/src/components/settings/domain-routing/domain-routing.tsx@@ -20,7 +20,7 @@ import { Switch } from "@/components/ui/switch";import { Tooltip } from "@/components/ui/tooltip";import { CardGridSkeleton } from "@/components/page-skeletons";import { useSelectedMailbox } from "@/components/mailbox-provider";-import type { DomainRule, DomainRuleInput } from "./types";+import type { DomainRoutingProps, DomainRule, DomainRuleInput } from "./types";import {ACTION_LABELS,MATCH_FIELD_LABELS,@@ -41,7 +41,7 @@ const ACTION_ICONS = {reject: Ban,} as const;-export function DomainRouting() {+export function DomainRouting({ domain }: DomainRoutingProps = {}) {const qc = useQueryClient();const { selectedMailbox, isLoading: isMailboxLoading } = useSelectedMailbox();const [dialogOpen, setDialogOpen] = useState(false);@@ -49,44 +49,46 @@ export function DomainRouting() {const [form, setForm] = useState<DomainRuleInput>(emptyRuleInput(""));const [error, setError] = useState<string | null>(null);- const domainId = selectedMailbox?.domainId ?? "";+ const domainId = domain?.id ?? selectedMailbox?.domainId ?? "";const mailboxId = selectedMailbox?.id ?? "";- const canManage = selectedMailbox?.permission === "full_access";+ const mailboxAccessId = domain ? undefined : mailboxId;+ const canManage = !!domain || selectedMailbox?.permission === "full_access";+ const rulesQueryKey = ["domain-rules", domainId, mailboxAccessId ?? "admin"] as const;const rules = useQuery({- queryKey: ["domain-rules", domainId, mailboxId],- enabled: !!domainId && !!mailboxId && canManage,- queryFn: () => fetchDomainRules(domainId, mailboxId),+ queryKey: rulesQueryKey,+ enabled: !!domainId && (!!domain || !!mailboxId) && canManage,+ queryFn: () => fetchDomainRules(domainId, mailboxAccessId),});- const hostname = selectedMailbox?.hostname ?? "";+ const hostname = domain?.hostname ?? selectedMailbox?.hostname ?? "";const mailboxes = rules.data?.mailboxes ?? [];const save = useMutation({mutationFn: () => {const payload: DomainRuleInput = { ...form, domainId };return editing- ? updateDomainRule(editing.id, payload, mailboxId)- : createDomainRule(payload, mailboxId);+ ? updateDomainRule(editing.id, payload, mailboxAccessId)+ : createDomainRule(payload, mailboxAccessId);},onSuccess: () => {setDialogOpen(false);setEditing(null);setError(null);- qc.invalidateQueries({ queryKey: ["domain-rules", domainId, mailboxId] });+ qc.invalidateQueries({ queryKey: rulesQueryKey });},onError: (e: Error) => setError(e.message),});const remove = useMutation({- mutationFn: (id: string) => deleteDomainRule(id, mailboxId),- onSuccess: () => qc.invalidateQueries({ queryKey: ["domain-rules", domainId, mailboxId] }),+ mutationFn: (id: string) => deleteDomainRule(id, mailboxAccessId),+ onSuccess: () => qc.invalidateQueries({ queryKey: rulesQueryKey }),});const toggle = useMutation({mutationFn: (rule: DomainRule) =>- updateDomainRule(rule.id, { ...ruleToInput(rule), enabled: !rule.enabled }, mailboxId),- onSuccess: () => qc.invalidateQueries({ queryKey: ["domain-rules", domainId, mailboxId] }),+ updateDomainRule(rule.id, { ...ruleToInput(rule), enabled: !rule.enabled }, mailboxAccessId),+ onSuccess: () => qc.invalidateQueries({ queryKey: rulesQueryKey }),});function openCreate() {@@ -121,15 +123,15 @@ export function DomainRouting() {<p className="mt-1 text-sm text-neutral-500">Rules for {hostname || "Select an inbox"}</p></div><div className="flex items-end gap-2">- <Button onClick={openCreate} disabled={!mailboxId || !canManage}>+ <Button onClick={openCreate} disabled={!domainId || (!domain && !mailboxId) || !canManage}><Plus className="h-4 w-4" /> Add route</Button></div></div>- {isMailboxLoading || rules.isLoading ? (+ {(!domain && isMailboxLoading) || rules.isLoading ? (<CardGridSkeleton />- ) : !mailboxId ? (+ ) : !domain && !mailboxId ? (<Card><CardContent className="pt-6 text-sm text-neutral-500">Select an inbox before creating routing rules.diff --git a/src/components/settings/domain-routing/types.d.ts b/src/components/settings/domain-routing/types.d.tsindex 860a20f..d8c0933 100644--- a/src/components/settings/domain-routing/types.d.ts+++ b/src/components/settings/domain-routing/types.d.ts@@ -41,3 +41,10 @@ export type DomainRuleInput = {rejectReason?: string | null;priority: number;};++export type DomainRoutingProps = {+ domain?: {+ id: string;+ hostname: string;+ };+};diff --git a/src/components/settings/domain-routing/utils.ts b/src/components/settings/domain-routing/utils.tsindex 9a97f97..54aae5b 100644--- a/src/components/settings/domain-routing/utils.ts+++ b/src/components/settings/domain-routing/utils.ts@@ -38,17 +38,27 @@ async function readJson<T>(res: Response): Promise<T> {export async function fetchDomainRules(domainId: string,- mailboxId: string,+ mailboxId?: string,): Promise<{ rules: DomainRule[]; mailboxes: DomainRuleMailbox[] }> {- const params = new URLSearchParams({ domainId, mailboxId });+ const params = new URLSearchParams({ domainId });+ if (mailboxId) params.set("mailboxId", mailboxId);const res = await authFetch(`/api/routing-rules/domain?${params}`);const json = await readJson<{ rules: DomainRule[]; mailboxes: DomainRuleMailbox[] }>(res);return { rules: json.rules ?? [], mailboxes: json.mailboxes ?? [] };}-export async function createDomainRule(input: DomainRuleInput, mailboxId: string) {++function domainRuleUrl(id: string | null, mailboxId?: string): string {+ const params = new URLSearchParams();+ if (mailboxId) params.set("mailboxId", mailboxId);+ const queryString = params.toString();+ const query = queryString ? `?${queryString}` : "";+ return `/api/routing-rules/domain${id ? `/${id}` : ""}${query}`;+}++export async function createDomainRule(input: DomainRuleInput, mailboxId?: string) {return readJson(- await authFetch(`/api/routing-rules/domain?${new URLSearchParams({ mailboxId })}`, {+ await authFetch(domainRuleUrl(null, mailboxId), {method: "POST",headers: { "Content-Type": "application/json" },body: JSON.stringify(input),@@ -56,9 +66,9 @@ export async function createDomainRule(input: DomainRuleInput, mailboxId: string);}-export async function updateDomainRule(id: string, input: DomainRuleInput, mailboxId: string) {+export async function updateDomainRule(id: string, input: DomainRuleInput, mailboxId?: string) {return readJson(- await authFetch(`/api/routing-rules/domain/${id}?${new URLSearchParams({ mailboxId })}`, {+ await authFetch(domainRuleUrl(id, mailboxId), {method: "PATCH",headers: { "Content-Type": "application/json" },body: JSON.stringify(input),@@ -66,8 +76,8 @@ export async function updateDomainRule(id: string, input: DomainRuleInput, mailb);}-export async function deleteDomainRule(id: string, mailboxId: string) {- return readJson(await authFetch(`/api/routing-rules/domain/${id}?${new URLSearchParams({ mailboxId })}`, { method: "DELETE" }));+export async function deleteDomainRule(id: string, mailboxId?: string) {+ return readJson(await authFetch(domainRuleUrl(id, mailboxId), { method: "DELETE" }));}export function describeRule(rule: DomainRule, mailboxes: DomainRuleMailbox[], hostname: string): string {diff --git a/src/lib/domains/routing-rules.ts b/src/lib/domains/routing-rules.tsindex 8f0bc43..a44240f 100644--- a/src/lib/domains/routing-rules.ts+++ b/src/lib/domains/routing-rules.ts@@ -1,6 +1,6 @@import { and, asc, desc, eq } from "drizzle-orm";import type { AppDatabase } from "@/db";-import { routingRules } from "@/db/schema";+import { domains, mailboxes, routingRules } from "@/db/schema";import type { SessionUser } from "@/lib/auth/types";import { getMailboxAccessLevel, listAccessibleMailboxes } from "@/lib/mailboxes/access";@@ -50,6 +50,43 @@ export async function listManagedDomainMailboxes(.sort((a, b) => a.localPart.localeCompare(b.localPart));}+export async function getAdminDomain(+ db: AppDatabase,+ user: Pick<SessionUser, "id" | "role" | "canManageMailboxes" | "createdByUserId">,+ domainId: string,+) {+ if (user.role !== "admin") return null;+ const ownerId = user.canManageMailboxes && user.createdByUserId ? user.createdByUserId : user.id;+ const [domain] = await db+ .select()+ .from(domains)+ .where(and(eq(domains.id, domainId), eq(domains.userId, ownerId)))+ .limit(1);+ return domain ?? null;+}++export async function listAdminDomainMailboxes(db: AppDatabase, domainId: string) {+ return db+ .select({+ id: mailboxes.id,+ localPart: mailboxes.localPart,+ displayName: mailboxes.displayName,+ disabled: mailboxes.disabled,+ })+ .from(mailboxes)+ .where(eq(mailboxes.domainId, domainId))+ .orderBy(asc(mailboxes.localPart));+}++export async function assertAdminRuleMailbox(db: AppDatabase, mailboxId: string, domainId: string): Promise<boolean> {+ const [mailbox] = await db+ .select({ id: mailboxes.id })+ .from(mailboxes)+ .where(and(eq(mailboxes.id, mailboxId), eq(mailboxes.domainId, domainId)))+ .limit(1);+ return !!mailbox;+}+/** A rule can deliver only to an inbox that the caller can fully manage. */export async function assertRuleMailbox(db: AppDatabase,