Email for professionals and teams
fix(accounts): apply managed-account authorization to mailbox lists
CQMHVe33861edf77b
diff --git a/src/app/api/accounts/[id]/mailboxes/route.ts b/src/app/api/accounts/[id]/mailboxes/route.tsindex 56ec484..037aa9f 100644--- a/src/app/api/accounts/[id]/mailboxes/route.ts+++ b/src/app/api/accounts/[id]/mailboxes/route.ts@@ -2,6 +2,7 @@ import { eq } from "drizzle-orm";import { NextResponse } from "next/server";import { getDb } from "@/db";import { domains, mailboxes } from "@/db/schema";+import { canManageUserAccount } from "@/lib/auth/admin";import { requireTeamAdmin } from "../../utils";import { selectAccountById } from "../utils";import type { AccountRouteParams } from "../types";@@ -12,7 +13,7 @@ export async function GET(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 || (account.id !== access.user!.id && !canManageUserAccount(access.user!, account))) {return NextResponse.json({ error: "Account not found" }, { status: 404 });}const rows = await db.select({diff --git a/src/app/api/accounts/[id]/route.ts b/src/app/api/accounts/[id]/route.tsindex 724a51e..ffbc154 100644--- a/src/app/api/accounts/[id]/route.ts+++ b/src/app/api/accounts/[id]/route.ts@@ -6,7 +6,7 @@ import { updateManagedAccountSchema } from "@/lib/validators";import { requireTeamAdmin } from "../utils";import { getAccountSeatError } from "@/lib/licenses/seats";import { getLicenseEntitlements } from "@/lib/licenses/service";-import { canManageUsers, isPrimaryAdmin } from "@/lib/auth/admin";+import { canManageUserAccount, canManageUsers, isPrimaryAdmin } from "@/lib/auth/admin";import type { AccountRouteParams } from "./types";import { selectAccountById, updateAccountCredentials } from "./utils";import { deleteUserSessions } from "@/lib/auth/session";@@ -34,7 +34,7 @@ export async function GET(request: Request, { params }: AccountRouteParams) {forwardingEmail: account.forwardingEmail,canForwardEmail: (await getLicenseEntitlements(access.env)).canForwardEmail,hasAvatar: !!account.avatarKey,- editable: isPrimaryAdmin(actor) || (canManageUsers(actor) && account.role === "user" && !account.isPrimaryAdmin),+ editable: canManageUserAccount(actor, account),canChangeRole: isPrimaryAdmin(actor),canTransferPrimary: isPrimaryAdmin(actor) && !account.isPrimaryAdmin && !account.disabled,},@@ -59,7 +59,7 @@ export async function PATCH(request: Request, { params }: AccountRouteParams) {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)) {+ if (!canManageUserAccount(actor, account)) {return NextResponse.json({ error: "Only the primary admin can manage admin accounts" }, { status: 403 });}const parsed = updateManagedAccountSchema.safeParse(await request.json());diff --git a/src/lib/auth/admin.ts b/src/lib/auth/admin.tsindex 687b997..1a2bedb 100644--- a/src/lib/auth/admin.ts+++ b/src/lib/auth/admin.ts@@ -41,3 +41,11 @@ export function canManageUsers(): boolean {return isPrimaryAdmin(user) || (user.role === "admin" && user.canManageUsers);}++/** Only the primary admin can manage another administrator's account. */+export function canManageUserAccount(+ user: Pick<SessionUser, "role" | "isPrimaryAdmin" | "canManageUsers">,+ account: Pick<SessionUser, "role" | "isPrimaryAdmin">,+): boolean {+ return isPrimaryAdmin(user) || (canManageUsers(user) && account.role === "user" && !account.isPrimaryAdmin);+}