Email for professionals and teams
fix(mailboxes): allow account administrators to edit mailbox settings
CQMHV44ce4fc95887
diff --git a/CLAUDE.md b/CLAUDE.mdindex 86ed313..b36a658 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -166,7 +166,7 @@ Two independent auth surfaces:- **Session cookie** (`ep_session`) — `getCurrentUser` / `requireUser` in `src/lib/auth/cookies.ts`, backed by `src/lib/auth/session.ts`. Used by dashboard/admin API routes. `requireUser` *throws*, which Next surfaces as a 500; prefer `requireSessionUser` from `src/lib/api/auth.ts`, which returns a proper 401 response. Most older routes still use `requireUser` and 500 on unauthenticated requests.- **API key bearer token** — `authenticateApiKey` + `requireScope` in `src/lib/api/auth.ts`, used by the public `/api/v1/*` surface.-Mailbox authorization is separate from user role and goes through `src/lib/mailboxes/access.ts` (`getMailboxAccessLevel`, `listAccessibleMailboxes`, `listAccessibleMailboxIds`), which accounts for ownership, the `mailbox_access` sharing table, and admin role. Message queries scope by accessible mailbox IDs, not by `userId` — see `src/app/api/messages/route.ts` for the canonical pattern.+Mailbox content authorization goes through `src/lib/mailboxes/access.ts` (`getMailboxAccessLevel`, `listAccessibleMailboxes`, `listAccessibleMailboxIds`), which accounts for ownership and the `mailbox_access` sharing table. Message queries scope by accessible mailbox IDs, not by `userId` — see `src/app/api/messages/route.ts` for the canonical pattern. Mailbox details, aliases and avatars use `getMailboxSettingsAccess` in `src/lib/mailboxes/settings-access.ts`: on an installation licensed for account management, the primary admin can configure other accounts' mailboxes, and admins with user-management permission can configure ordinary users' mailboxes. This does not grant access to their messages or sending identities. Primary mailbox names and avatars follow the mailbox owner's account identity.### Folders are mostly virtualdiff --git a/src/app/(admin)/mailboxes/[id]/page.tsx b/src/app/(admin)/mailboxes/[id]/page.tsxindex 68bc765..c6fa0c9 100644--- a/src/app/(admin)/mailboxes/[id]/page.tsx+++ b/src/app/(admin)/mailboxes/[id]/page.tsx@@ -101,7 +101,7 @@ export default function MailboxSettingsPage() {const sharedAccess = useQuery({queryKey: ["mailbox", mailboxId, "access"],queryFn: () => fetchSharedInboxAccess(mailboxId),- enabled: mailbox.data?.type === "shared",+ enabled: mailbox.data?.canManageSharing === true,});const addMember = useMutation({mutationFn: () => grantSharedInboxAccess(mailboxId, selectedUserId),@@ -296,7 +296,7 @@ export default function MailboxSettingsPage() {</CardContent></Card>- {mailbox.data?.type === "shared" && (+ {mailbox.data?.canManageSharing && (<Card className="rounded-3xl border-0 bg-white p-6"><CardHeader className="py-0"><CardTitle>{t("mailbox.sharedAccess")}</CardTitle>diff --git a/src/app/(admin)/mailboxes/[id]/types.d.ts b/src/app/(admin)/mailboxes/[id]/types.d.tsindex 3ca3b2e..da6e43f 100644--- a/src/app/(admin)/mailboxes/[id]/types.d.ts+++ b/src/app/(admin)/mailboxes/[id]/types.d.ts@@ -7,7 +7,8 @@ export type MailboxDetail = {useAllDomains: boolean;hasAvatar?: boolean;type?: "personal" | "shared";- permission?: "read_only" | "send_as" | "send_on_behalf" | "full_access";+ permission?: "read_only" | "send_as" | "send_on_behalf" | "full_access" | null;+ canManageSharing?: boolean;disabled?: boolean;createdAt: string;hostname: string;diff --git a/src/app/api/mailboxes/[id]/aliases/route.ts b/src/app/api/mailboxes/[id]/aliases/route.tsindex 84ee7a1..1a48d22 100644--- a/src/app/api/mailboxes/[id]/aliases/route.ts+++ b/src/app/api/mailboxes/[id]/aliases/route.ts@@ -6,17 +6,18 @@ import { requireUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";import { deleteEmailRoutingRuleForAddress, ensureEmailRoutingRuleToWorker } from "@/lib/cloudflare-api";import { newId } from "@/lib/ids";-import { getMailboxAccessLevel } from "@/lib/mailboxes/access";+import { getMailboxSettingsAccess } from "@/lib/mailboxes/settings-access";import { createMailboxAliasSchema } from "@/lib/validators";import type { MailboxRouteParams } from "../types";async function getManagedMailbox(- db: ReturnType<typeof getDb>,+ env: CloudflareEnv,user: Awaited<ReturnType<typeof requireUser>>,mailboxId: string,) {- const access = await getMailboxAccessLevel(db, user, mailboxId);+ const access = await getMailboxSettingsAccess(env, user, mailboxId);if (!access?.canManage) return null;+ const db = getDb(env);const [mailbox] = await db.select({ id: mailboxes.id, domainId: mailboxes.domainId, localPart: mailboxes.localPart }).from(mailboxes)@@ -53,7 +54,7 @@ export async function GET(request: Request, { params }: MailboxRouteParams) {const env = getEnv();const user = await requireUser(env, request);const db = getDb(env);- const mailbox = await getManagedMailbox(db, user, id);+ const mailbox = await getManagedMailbox(env, user, id);if (!mailbox) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });const ownerId = await getDomainOwnerId(db, mailbox.domainId);@@ -80,7 +81,7 @@ export async function POST(request: Request, { params }: MailboxRouteParams) {}const db = getDb(env);- const mailbox = await getManagedMailbox(db, user, id);+ const mailbox = await getManagedMailbox(env, user, id);if (!mailbox) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });const ownerId = await getDomainOwnerId(db, mailbox.domainId);@@ -153,7 +154,7 @@ export async function DELETE(request: Request, { params }: MailboxRouteParams) {if (!aliasId) return NextResponse.json({ error: "Alias is required" }, { status: 400 });const db = getDb(env);- const mailbox = await getManagedMailbox(db, user, id);+ const mailbox = await getManagedMailbox(env, user, id);if (!mailbox) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });const [alias] = await dbdiff --git a/src/app/api/mailboxes/[id]/avatar/route.ts b/src/app/api/mailboxes/[id]/avatar/route.tsindex 74d6c74..a0e5313 100644--- a/src/app/api/mailboxes/[id]/avatar/route.ts+++ b/src/app/api/mailboxes/[id]/avatar/route.ts@@ -5,7 +5,7 @@ import { domains, mailboxes, users } from "@/db/schema";import { requireUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";import { getAvatarImageResponse, getOptimizedAvatarFiles, storeAvatarImages } from "@/lib/avatar-images";-import { getMailboxAccessLevel } from "@/lib/mailboxes/access";+import { getMailboxSettingsAccess } from "@/lib/mailboxes/settings-access";import { avatarKeyFor } from "@/app/api/profile/avatar/utils";import { tracksAccountIdentity } from "@/lib/profile/identity-utils";import { syncPersonalIdentity } from "@/lib/profile/sync";@@ -17,7 +17,7 @@ export async function GET(request: Request, { params }: MailboxAvatarRouteParamsconst env = getEnv();const user = await requireUser(env, request);const db = getDb(env);- const access = await getMailboxAccessLevel(db, user, id);+ const access = await getMailboxSettingsAccess(env, user, id);if (!access?.canRead) return new Response("Not found", { status: 404 });const [mailbox] = await db@@ -47,7 +47,7 @@ export async function POST(request: Request, { params }: MailboxAvatarRouteParamconst env = getEnv();const user = await requireUser(env, request);const db = getDb(env);- const access = await getMailboxAccessLevel(db, user, id);+ const access = await getMailboxSettingsAccess(env, user, id);if (!access?.canManage) {return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });}diff --git a/src/app/api/mailboxes/[id]/route.ts b/src/app/api/mailboxes/[id]/route.tsindex 8c9c278..e5dd1d1 100644--- a/src/app/api/mailboxes/[id]/route.ts+++ b/src/app/api/mailboxes/[id]/route.ts@@ -4,30 +4,30 @@ import { getDb } from "@/db";import { mailboxes, users } from "@/db/schema";import { requireUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";-import { getMailboxAccessLevel } from "@/lib/mailboxes/access";+import { getMailboxSettingsAccess } from "@/lib/mailboxes/settings-access";import { ensureMailboxDomainRouting, removeMailboxDomainRouting } from "@/lib/mailboxes/domain-addresses";import { isPrimaryMailbox, tracksAccountIdentity } from "@/lib/profile/identity-utils";import { syncPersonalIdentity } from "@/lib/profile/sync";import { updateMailboxSchema } from "@/lib/validators";import type { MailboxRouteParams } from "./types";-import { getMailboxUpdateValues, selectMailboxForUser } from "./utils";+import { getMailboxUpdateValues, selectMailboxById } from "./utils";export async function GET(request: Request, { params }: MailboxRouteParams) {const { id } = await params;const env = getEnv();const user = await requireUser(env, request);const db = getDb(env);- const access = await getMailboxAccessLevel(db, user, id);+ const access = await getMailboxSettingsAccess(env, user, id);if (!access?.canRead) {return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });}- const [mailbox] = await selectMailboxForUser(db, user.id, id);+ const [mailbox] = await selectMailboxById(db, id);if (!mailbox) {return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });}- const { avatarKey, ownerName, ownerAvatarKey, ...mailboxDetails } = mailbox;- const identity = tracksAccountIdentity(mailbox, user.email);+ const { avatarKey, ownerName, ownerEmail, ownerAvatarKey, ...mailboxDetails } = mailbox;+ const identity = tracksAccountIdentity(mailbox, ownerEmail);return NextResponse.json({mailbox: {@@ -35,7 +35,8 @@ export async function GET(request: Request, { params }: MailboxRouteParams) {displayName: identity ? ownerName : mailbox.displayName,hasAvatar: identity ? !!ownerAvatarKey : !!avatarKey,permission: access.permission,- isPrimary: isPrimaryMailbox(mailbox, user.email),+ canManageSharing: user.role === "admin" && mailbox.type === "shared" && mailbox.userId === user.id,+ isPrimary: isPrimaryMailbox(mailbox, ownerEmail),},});}@@ -51,8 +52,8 @@ export async function PATCH(request: Request, { params }: MailboxRouteParams) {}const db = getDb(env);- const access = await getMailboxAccessLevel(db, user, id);- const [existing] = await selectMailboxForUser(db, user.id, id);+ const access = await getMailboxSettingsAccess(env, user, id);+ const [existing] = await selectMailboxById(db, id);if (!existing || !access?.canManage) {return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });@@ -61,7 +62,7 @@ export async function PATCH(request: Request, { params }: MailboxRouteParams) {const updateValues = getMailboxUpdateValues(parsed.data);// Only the primary mailbox carries the account name; renaming any other// mailbox writes to that mailbox alone.- if (tracksAccountIdentity(existing, user.email) && "displayName" in parsed.data) {+ if (tracksAccountIdentity(existing, existing.ownerEmail) && "displayName" in parsed.data) {const name = parsed.data.displayName?.trim();if (!name) {return NextResponse.json({ error: "A valid account name is required" }, { status: 400 });@@ -96,9 +97,9 @@ export async function PATCH(request: Request, { params }: MailboxRouteParams) {.where(eq(mailboxes.id, id));}- const [mailbox] = await selectMailboxForUser(db, user.id, id);- const { avatarKey, ownerName, ownerAvatarKey, ...mailboxDetails } = mailbox!;- const identity = tracksAccountIdentity(mailbox!, user.email);+ const [mailbox] = await selectMailboxById(db, id);+ const { avatarKey, ownerName, ownerEmail, ownerAvatarKey, ...mailboxDetails } = mailbox!;+ const identity = tracksAccountIdentity(mailbox!, ownerEmail);return NextResponse.json({mailbox: {@@ -106,7 +107,8 @@ export async function PATCH(request: Request, { params }: MailboxRouteParams) {displayName: identity ? ownerName : mailbox!.displayName,hasAvatar: identity ? !!ownerAvatarKey : !!avatarKey,permission: access.permission,- isPrimary: isPrimaryMailbox(mailbox!, user.email),+ canManageSharing: user.role === "admin" && mailbox!.type === "shared" && mailbox!.userId === user.id,+ isPrimary: isPrimaryMailbox(mailbox!, ownerEmail),},});}diff --git a/src/app/api/mailboxes/[id]/utils.ts b/src/app/api/mailboxes/[id]/utils.tsindex 7ec5fb2..f063346 100644--- a/src/app/api/mailboxes/[id]/utils.ts+++ b/src/app/api/mailboxes/[id]/utils.ts@@ -5,7 +5,7 @@ import type { MailboxUpdateValues } from "./types";type Db = ReturnType<typeof getDb>;-export function selectMailboxForUser(db: Db, userId: string, mailboxId: string) {+export function selectMailboxById(db: Db, mailboxId: string) {return db.select({id: mailboxes.id,@@ -20,6 +20,7 @@ export function selectMailboxForUser(db: Db, userId: string, mailboxId: string)useAllDomains: mailboxes.useAllDomains,avatarKey: mailboxes.avatarKey,ownerName: users.name,+ ownerEmail: users.email,ownerAvatarKey: users.avatarKey,type: mailboxes.type,disabled: mailboxes.disabled,diff --git a/src/lib/mailboxes/settings-access.ts b/src/lib/mailboxes/settings-access.tsnew file mode 100644index 0000000..fedfb32--- /dev/null+++ b/src/lib/mailboxes/settings-access.ts@@ -0,0 +1,30 @@+import { and, eq, isNull } from "drizzle-orm";+import { getDb } from "@/db";+import { mailboxes, users } from "@/db/schema";+import { canManageUserAccount, canManageUsers } from "@/lib/auth/admin";+import type { SessionUser } from "@/lib/auth/types";+import { getLicenseEntitlements } from "@/lib/licenses/service";+import { getMailboxAccessLevel } from "./access";++/** Configuration access does not grant permission to read or send mail. */+export async function getMailboxSettingsAccess(+ env: CloudflareEnv,+ user: Pick<SessionUser, "id" | "role" | "isPrimaryAdmin" | "canManageUsers">,+ mailboxId: string,+) {+ const db = getDb(env);+ const access = await getMailboxAccessLevel(db, user, mailboxId);+ if (access?.canManage || !canManageUsers(user)) return access;++ const [owner] = await db+ .select({ role: users.role, isPrimaryAdmin: users.isPrimaryAdmin })+ .from(mailboxes)+ .innerJoin(users, eq(mailboxes.userId, users.id))+ .where(and(eq(mailboxes.id, mailboxId), eq(mailboxes.disabled, false), isNull(users.deletedAt)))+ .limit(1);+ if (!owner || !canManageUserAccount(user, owner) || !(await getLicenseEntitlements(env)).canManageAccounts) {+ return access;+ }++ return { permission: access?.permission ?? null, canRead: true, canManage: true };+}diff --git a/tests/mailbox-identity-scope.test.mjs b/tests/mailbox-identity-scope.test.mjsindex fc4dd36..4dd8a86 100644--- a/tests/mailbox-identity-scope.test.mjs+++ b/tests/mailbox-identity-scope.test.mjs@@ -110,7 +110,7 @@ test("the identity write is keyed by mailbox id, not by owner and type", () => {test("the mailbox routes gate the account name on the identity check", () => {const detail = read("src/app/api/mailboxes/[id]/route.ts");- assert.match(detail, /tracksAccountIdentity\(existing, user\.email\) && "displayName" in parsed\.data/);+ assert.match(detail, /tracksAccountIdentity\(existing, existing\.ownerEmail\) && "displayName" in parsed\.data/);assert.ok(!/existing\.type === "personal" && "displayName" in parsed\.data/.test(detail),"PATCH must not treat every personal mailbox as the account identity",