Skip to content

Email for professionals and teams

Add account deletion #100

Hieu Nguyen (Jack)96ce3911afff
diff --git a/drizzle/migrations/0063_add_account_deletion.sql b/drizzle/migrations/0063_add_account_deletion.sql
new file mode 100644
index 0000000..3dd5cbe
--- /dev/null
+++ b/drizzle/migrations/0063_add_account_deletion.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `users` ADD `last_sign_in_at` integer;--> statement-breakpoint
+ALTER TABLE `users` ADD `deleted_at` integer;
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index 365e49f..79ae972 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -386,6 +386,13 @@
"when": 1788850803023,
"tag": "0062_add_remote_content_settings",
"breakpoints": true
+ },
+ {
+ "idx": 55,
+ "version": "6",
+ "when": 1788850804023,
+ "tag": "0063_add_account_deletion",
+ "breakpoints": true
}
]
}
diff --git a/server/runtime/scheduler.ts b/server/runtime/scheduler.ts
index dd72cfc..6fa9d22 100644
--- a/server/runtime/scheduler.ts
+++ b/server/runtime/scheduler.ts
@@ -2,6 +2,7 @@ import { runScheduledDatabaseBackup } from "@/lib/backups/runner";
import { runAgentMaintenance } from "@/lib/agent/maintenance";
import { runTrashRetention } from "@/lib/email/trash-retention";
import { runDriveTrashRetention } from "@/lib/drive/retention";
+import { runAccountRetention } from "@/lib/accounts/deletion";
/** Fire the daily 02:00 UTC backup and the recurring maintenance jobs, matching the cron triggers in wrangler.jsonc. */
export function startScheduler(env: CloudflareEnv) {
@@ -15,6 +16,7 @@ export function startScheduler(env: CloudflareEnv) {
lastRunDay = day;
runScheduledDatabaseBackup(env, now).catch((error) => console.error("Scheduled backup failed", error));
runDriveTrashRetention(env, now).catch((error) => console.error("Drive trash retention failed", error));
+ runAccountRetention(env, now).catch((error) => console.error("Account retention failed", error));
}, 60_000);
return () => clearInterval(timer);
}
diff --git a/src/app/(admin)/accounts/accounts-table-types.d.ts b/src/app/(admin)/accounts/accounts-table-types.d.ts
new file mode 100644
index 0000000..bbbc599
--- /dev/null
+++ b/src/app/(admin)/accounts/accounts-table-types.d.ts
@@ -0,0 +1,21 @@
+import type { Account } from "./types";
+
+export type AccountsTableProps = {
+ accounts: Account[];
+ currentUserId?: string;
+ isPrimaryAdmin: boolean;
+ loading: boolean;
+ selected: Set<string>;
+ onSelectedChange: (selected: Set<string>) => void;
+ onDeleteSelected: () => void;
+ onRestore: (account: Account) => void;
+ restoringId: string | null;
+};
+
+export type DeleteAccountsDialogProps = {
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+ accounts: Account[];
+ candidates: Account[];
+ onDeleted: () => void;
+};
diff --git a/src/app/(admin)/accounts/accounts-table.tsx b/src/app/(admin)/accounts/accounts-table.tsx
new file mode 100644
index 0000000..1c29b2a
--- /dev/null
+++ b/src/app/(admin)/accounts/accounts-table.tsx
@@ -0,0 +1,78 @@
+"use client";
+
+import Link from "next/link";
+import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
+import { MoreVertical, RotateCcw, Trash2 } from "lucide-react";
+import { useLanguage } from "@/components/language-provider";
+import { ProgressiveAvatarImage } from "@/components/progressive-avatar-image";
+import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import { getAvatarColorStyle } from "@/lib/avatar-colors";
+import { getAccountPurgeDate, getAccountStatus } from "@/lib/accounts/deletion-utils";
+import { formatAccountDate, formatAccountDateTime } from "./utils";
+import type { AccountsTableProps } from "./accounts-table-types";
+
+const COLUMNS = "grid grid-cols-[auto_minmax(0,1fr)_1.75rem] items-center gap-x-4 md:grid-cols-[auto_minmax(0,2fr)_minmax(0,1fr)_minmax(0,1fr)_1.75rem]";
+const STATUS_STYLES = {
+ active: "bg-green-600/10 text-green-800",
+ disabled: "bg-neutral-100 text-neutral-600",
+ pendingDeletion: "bg-red-100 text-red-700",
+};
+
+export function AccountsTable({ accounts, currentUserId, isPrimaryAdmin, loading, selected, onSelectedChange, onDeleteSelected, onRestore, restoringId }: AccountsTableProps) {
+ const { t } = useLanguage();
+ const isSelectable = (account: AccountsTableProps["accounts"][number]) =>
+ !account.isPrimaryAdmin && account.id !== currentUserId && !account.deletedAt && (isPrimaryAdmin || account.role !== "admin");
+ const selectable = accounts.filter(isSelectable);
+ const allSelected = selectable.length > 0 && selectable.every((account) => selected.has(account.id));
+
+ function toggle(id: string, checked: boolean) {
+ const next = new Set(selected);
+ if (checked) next.add(id);
+ else next.delete(id);
+ onSelectedChange(next);
+ }
+
+ return <div className="overflow-hidden rounded-3xl bg-white">
+ <div className={`${COLUMNS} border-b border-neutral-100 px-5 py-3 text-xs font-medium uppercase text-neutral-500`}>
+ <Checkbox aria-label={t("accounts.selectAll")} checked={allSelected} disabled={!selectable.length} onChange={(event) => onSelectedChange(event.target.checked ? new Set(selectable.map((account) => account.id)) : new Set())} />
+ <span>{selected.size ? t("common.selectedCount", { count: selected.size }) : t("accounts.colAccount")}</span>
+ <span className="hidden md:block">{t("accounts.colStatus")}</span>
+ <span className="hidden md:block">{t("accounts.colLastSignIn")}</span>
+ <span className="flex justify-end">
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger asChild><Button variant="ghost" size="sm" className="h-7 w-7 p-0" aria-label={t("accounts.moreActions")}><MoreVertical className="h-4 w-4" /></Button></DropdownMenu.Trigger>
+ <DropdownMenu.Portal><DropdownMenu.Content align="end" sideOffset={6} className="z-50 min-w-48 rounded-lg border border-neutral-200 bg-white p-1 text-sm normal-case shadow-lg">
+ <DropdownMenu.Item disabled={!selected.size} onSelect={onDeleteSelected} className="flex cursor-pointer items-center gap-2 rounded-md px-3 py-2 text-red-600 outline-none hover:bg-red-50 focus:bg-red-50 data-[disabled]:pointer-events-none data-[disabled]:opacity-50"><Trash2 className="h-4 w-4" />{t("accounts.deleteSelected")}</DropdownMenu.Item>
+ </DropdownMenu.Content></DropdownMenu.Portal>
+ </DropdownMenu.Root>
+ </span>
+ </div>
+ {loading && <p className="px-5 py-4 text-sm text-neutral-500">{t("common.loading")}</p>}
+ {accounts.map((account) => {
+ const locked = !isPrimaryAdmin && account.role === "admin" && account.id !== currentUserId;
+ const status = getAccountStatus({ disabled: !!account.disabled, deletedAt: account.deletedAt });
+ const statusLabel = status === "pendingDeletion" && account.deletedAt
+ ? t("accounts.status.pendingDeletion", { date: formatAccountDate(getAccountPurgeDate(new Date(account.deletedAt)).toISOString()) })
+ : t(`accounts.status.${status}`);
+ const identity = <>
+ <span className="min-w-0 flex items-center gap-4">
+ <span style={getAvatarColorStyle(account.email)} className="relative flex h-10 w-10 shrink-0 items-center justify-center overflow-hidden rounded-full font-semibold">{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 ? t("accounts.primaryAdmin") : t(account.role === "admin" ? "accounts.role.admin" : "accounts.role.user")}</span></span><span className="block truncate text-sm text-neutral-500">{account.email}</span></span>
+ </span>
+ <span className="hidden md:block"><span className={`rounded-full px-2 py-0.5 text-xs font-medium ${STATUS_STYLES[status]}`}>{statusLabel}</span></span>
+ <span className="hidden text-sm text-neutral-500 md:block">{account.lastSignInAt ? formatAccountDateTime(account.lastSignInAt) : t("accounts.neverSignedIn")}</span>
+ </>;
+ const rowClass = `${COLUMNS} px-5 py-3 border-b border-neutral-100 last:border-b-0`;
+ const checkbox = <Checkbox aria-label={t("accounts.selectOne", { name: account.name })} checked={selected.has(account.id)} disabled={!isSelectable(account)} onChange={(event) => toggle(account.id, event.target.checked)} />;
+ const restoreButton = !account.deletedAt ? <span /> : <span className="flex justify-end"><Button variant="ghost" size="sm" className="h-7 w-7 p-0" title={t("accounts.restore")} aria-label={t("accounts.restoreAccount", { name: account.name })} disabled={locked || restoringId === account.id} onClick={() => onRestore(account)}><RotateCcw className="h-4 w-4" /></Button></span>;
+ if (account.deletedAt) {
+ return <div key={account.id} className={`${rowClass} opacity-80`}>{checkbox}<div className="contents">{identity}</div>{restoreButton}</div>;
+ }
+ if (locked) {
+ return <div key={account.id} aria-disabled="true" title={t("accounts.lockedAdmin")} className={`${rowClass} cursor-not-allowed opacity-50`}>{checkbox}<div className="contents">{identity}</div>{restoreButton}</div>;
+ }
+ return <div key={account.id} className={`${rowClass} hover:bg-neutral-50`}>{checkbox}<Link href={`/accounts/${account.id}`} className="contents">{identity}</Link>{restoreButton}</div>;
+ })}
+ </div>;
+}
diff --git a/src/app/(admin)/accounts/delete-accounts-dialog.tsx b/src/app/(admin)/accounts/delete-accounts-dialog.tsx
new file mode 100644
index 0000000..47315da
--- /dev/null
+++ b/src/app/(admin)/accounts/delete-accounts-dialog.tsx
@@ -0,0 +1,52 @@
+"use client";
+
+import { useState } from "react";
+import { useLanguage } from "@/components/language-provider";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Label } from "@/components/ui/label";
+import { Select } from "@/components/ui/select";
+import { authFetch } from "@/lib/auth/client";
+import { ACCOUNT_RESTORE_DAYS } from "@/lib/accounts/deletion-utils";
+import type { DeleteAccountsDialogProps } from "./accounts-table-types";
+
+export function DeleteAccountsDialog({ open, onOpenChange, accounts, candidates, onDeleted }: DeleteAccountsDialogProps) {
+ const { t } = useLanguage();
+ const [transferToId, setTransferToId] = useState("");
+ const [deleting, setDeleting] = useState(false);
+ const [message, setMessage] = useState<string | null>(null);
+ const doomed = new Set(accounts.map((account) => account.id));
+ const recipients = candidates.filter((account) => !doomed.has(account.id) && !account.disabled && !account.deletedAt);
+
+ async function confirm() {
+ setDeleting(true);
+ setMessage(null);
+ try {
+ const response = await authFetch("/api/accounts", {
+ method: "DELETE",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ ids: accounts.map((account) => account.id), transferToId: transferToId || null }),
+ });
+ const data = (await response.json()) as { error?: string };
+ if (!response.ok) throw new Error(data.error ?? t("accounts.deleteFailed"));
+ setTransferToId("");
+ onDeleted();
+ } catch (error) {
+ setMessage(error instanceof Error ? error.message : t("accounts.deleteFailed"));
+ } finally {
+ setDeleting(false);
+ }
+ }
+
+ return <Dialog open={open} onOpenChange={(next) => { if (!deleting) { setMessage(null); onOpenChange(next); } }}>
+ <DialogContent className="max-h-[calc(100dvh-4rem)] w-[min(520px,calc(100vw-32px))] overflow-y-auto">
+ <DialogHeader><DialogTitle>{t("accounts.deleteTitle", { count: accounts.length })}</DialogTitle><DialogDescription>{t("accounts.deleteDescription", { days: ACCOUNT_RESTORE_DAYS })}</DialogDescription></DialogHeader>
+ <ul className="space-y-1 text-sm text-neutral-700">{accounts.map((account) => <li key={account.id} className="truncate">{account.name} <span className="text-neutral-500">{account.email}</span></li>)}</ul>
+ <div className="space-y-2"><Label htmlFor="transfer-account">{t("accounts.transferLabel")}</Label>
+ <Select id="transfer-account" value={transferToId} onChange={(event) => setTransferToId(event.target.value)} disabled={deleting} containerClassName="h-10 w-full bg-white px-0" className="px-3 text-sm"><option value="">{t("accounts.transferNone")}</option>{recipients.map((account) => <option key={account.id} value={account.id}>{account.name} ({account.email})</option>)}</Select>
+ <p className="text-xs text-neutral-500">{t("accounts.transferHint")}</p></div>
+ {message && <p role="alert" className="text-sm text-red-600">{message}</p>}
+ <div className="flex justify-end gap-2"><Button variant="outline" disabled={deleting} onClick={() => onOpenChange(false)}>{t("common.cancel")}</Button><Button variant="destructive" disabled={deleting || !accounts.length} onClick={confirm}>{deleting ? t("accounts.deleting") : t("accounts.confirmDelete")}</Button></div>
+ </DialogContent>
+ </Dialog>;
+}
diff --git a/src/app/(admin)/accounts/page.tsx b/src/app/(admin)/accounts/page.tsx
index b1a5211..e7c94d4 100644
--- a/src/app/(admin)/accounts/page.tsx
+++ b/src/app/(admin)/accounts/page.tsx
@@ -2,7 +2,6 @@
import { mobilePrimaryActionClass } from "@/components/page-header-utils";
import { useEffect, useState } from "react";
-import Link from "next/link";
import { Plus } from "lucide-react";
import { useLanguage } from "@/components/language-provider";
import { Button } from "@/components/ui/button";
@@ -11,13 +10,12 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Select } from "@/components/ui/select";
import { authFetch } from "@/lib/auth/client";
-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 { defaultTranslator } from "@/lib/i18n/utils";
import { AccountAliases } from "./account-aliases";
+import { AccountsTable } from "./accounts-table";
+import { DeleteAccountsDialog } from "./delete-accounts-dialog";
import type { Account, AccountAliasDraft, AccountResponse, Domain } from "./types";
async function fetchAccounts(): Promise<AccountResponse> {
@@ -46,6 +44,9 @@ export default function AccountsPage() {
const [message, setMessage] = useState<string | null>(null);
const [seats, setSeats] = useState<AccountResponse["seats"] | null>(null);
const [teamRequired, setTeamRequired] = useState(false);
+ const [selected, setSelected] = useState<Set<string>>(new Set());
+ const [deleteOpen, setDeleteOpen] = useState(false);
+ const [restoringId, setRestoringId] = useState<string | null>(null);
async function loadAccounts() {
const data = await fetchAccounts();
@@ -94,24 +95,30 @@ export default function AccountsPage() {
}
}
+ async function restoreAccount(account: Account) {
+ setRestoringId(account.id);
+ setMessage(null);
+ try {
+ const response = await authFetch(`/api/accounts/${account.id}/restore`, { method: "POST" });
+ const data = (await response.json()) as { error?: string };
+ if (!response.ok) throw new Error(data.error ?? t("accounts.restoreFailed"));
+ await loadAccounts();
+ } catch (error) {
+ setMessage(error instanceof Error ? error.message : t("accounts.restoreFailed"));
+ } finally {
+ setRestoringId(null);
+ }
+ }
+
const seatsFull = !!seats && seats.limit !== null && seats.used >= seats.limit;
return <div className="space-y-6">
<div className="flex items-center justify-between gap-4"><div><h1 className="text-2xl md:text-3xl font-medium text-neutral-900">{t("accounts.title")}</h1><p className="mt-2 text-sm text-neutral-500">{t("accounts.description")}</p>{seats && seats.limit !== null && <p className={`mt-1 text-sm ${seatsFull ? "text-amber-700" : "text-neutral-500"}`}>{t("accounts.seatsUsed", { used: seats.used, limit: seats.limit })}{seatsFull ? ` ${t("accounts.seatsFull")}` : ""}</p>}</div>{!teamRequired && canManage && <Button disabled={seatsFull} className={mobilePrimaryActionClass} onClick={() => setCreateOpen(true)}><Plus className="h-4 w-4" />{t("accounts.new")}</Button>}</div>
- <div className="relative">{teamRequired && <LicenseRequiredOverlay required="Pro or Team"><div className="min-h-48 rounded-3xl bg-white" /></LicenseRequiredOverlay>}<List>
- {loading && <p className="text-sm text-neutral-500">{t("common.loading")}</p>}
- {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 ? t("accounts.primaryAdmin") : t(account.role === "admin" ? "accounts.role.admin" : "accounts.role.user")}</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={t("accounts.lockedAdmin")} className="cursor-not-allowed opacity-50">{row}</ListRow>;
- }
- return <ListRow key={account.id} asChild><Link href={`/accounts/${account.id}`}>{row}</Link></ListRow>;
- })}
- </List></div>
+ {message && !createOpen && <p role="alert" className="text-sm text-red-600">{message}</p>}
+ <div className="relative">{teamRequired && <LicenseRequiredOverlay required="Pro or Team"><div className="min-h-48 rounded-3xl bg-white" /></LicenseRequiredOverlay>}
+ <AccountsTable accounts={accounts} currentUserId={currentUser?.id} isPrimaryAdmin={!!currentUser?.isPrimaryAdmin} loading={loading} selected={selected} onSelectedChange={setSelected} onDeleteSelected={() => setDeleteOpen(true)} onRestore={restoreAccount} restoringId={restoringId} />
+ </div>
+ <DeleteAccountsDialog open={deleteOpen} onOpenChange={setDeleteOpen} accounts={accounts.filter((account) => selected.has(account.id))} candidates={accounts} onDeleted={async () => { setDeleteOpen(false); setSelected(new Set()); await loadAccounts(); }} />
<Dialog open={createOpen} onOpenChange={setCreateOpen}><DialogContent className="max-h-[calc(100dvh-4rem)] w-[min(640px,calc(100vw-32px))] overflow-y-auto"><DialogHeader><DialogTitle>{t("accounts.addTitle")}</DialogTitle><DialogDescription>{t("accounts.addDescription")}</DialogDescription></DialogHeader><form onSubmit={createAccount}><fieldset disabled={saving} className="space-y-4">
<div className="space-y-2"><Label htmlFor="account-username">{t("auth.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={t("accounts.username")} className="min-w-0 flex-1 rounded-none border-0 shadow-none" required /><span className="flex items-center text-sm text-neutral-500">@</span><Select aria-label={t("accounts.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="">{t("accounts.selectDomain")}</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">{t("auth.password")}</Label><Input id="account-password" type="password" minLength={8} value={password} onChange={(event) => setPassword(event.target.value)} required /></div>
diff --git a/src/app/(admin)/accounts/types.d.ts b/src/app/(admin)/accounts/types.d.ts
index 12f372c..a3e6b0b 100644
--- a/src/app/(admin)/accounts/types.d.ts
+++ b/src/app/(admin)/accounts/types.d.ts
@@ -33,6 +33,8 @@ export type Account = {
canManageDomains?: boolean;
canManageUsers?: boolean;
createdAt: string;
+ lastSignInAt?: string | null;
+ deletedAt?: string | null;
mailboxId?: string | null;
localPart?: string | null;
hostname?: string | null;
diff --git a/src/app/(admin)/accounts/utils.ts b/src/app/(admin)/accounts/utils.ts
index 4806047..8309252 100644
--- a/src/app/(admin)/accounts/utils.ts
+++ b/src/app/(admin)/accounts/utils.ts
@@ -17,3 +17,13 @@ export function formatAccountDate(value: string): string {
year: "numeric",
}).format(new Date(value));
}
+
+export function formatAccountDateTime(value: string): string {
+ return new Intl.DateTimeFormat(undefined, {
+ month: "short",
+ day: "numeric",
+ year: "numeric",
+ hour: "numeric",
+ minute: "2-digit",
+ }).format(new Date(value));
+}
diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
index c67f5af..b0dbdfa 100644
--- a/src/app/(dashboard)/layout.tsx
+++ b/src/app/(dashboard)/layout.tsx
@@ -61,7 +61,7 @@ export default function DashboardLayout({
<div className="flex min-h-0 min-w-0 flex-col">
<header className="flex h-16 w-full shrink-0 items-center gap-3 pr-4 text-sm">
<MobileMenuButton className="ml-2" />
- <MailSearchInput />
+ <MailSearchInput mobileEnd />
{/* <Link
href="/settings/account"
className="flex h-10 w-10 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200"
diff --git a/src/app/api/accounts/[id]/restore/route.ts b/src/app/api/accounts/[id]/restore/route.ts
new file mode 100644
index 0000000..67094d7
--- /dev/null
+++ b/src/app/api/accounts/[id]/restore/route.ts
@@ -0,0 +1,13 @@
+import { NextResponse } from "next/server";
+import { restoreAccount } from "@/lib/accounts/deletion";
+import { requireTeamAdmin } from "../../utils";
+import type { AccountRouteParams } from "../types";
+
+export async function POST(request: Request, { params }: AccountRouteParams) {
+ const access = await requireTeamAdmin(request);
+ if (access.error) return access.error;
+ const { id } = await params;
+ const result = await restoreAccount(access.env, access.user!, id);
+ if (!result.ok) return NextResponse.json({ error: result.error }, { status: result.status });
+ return NextResponse.json({ ok: true });
+}
diff --git a/src/app/api/accounts/[id]/route.ts b/src/app/api/accounts/[id]/route.ts
index d038d59..724a51e 100644
--- a/src/app/api/accounts/[id]/route.ts
+++ b/src/app/api/accounts/[id]/route.ts
@@ -50,6 +50,9 @@ export async function PATCH(request: Request, { params }: AccountRouteParams) {
if (!account) {
return NextResponse.json({ error: "Account not found" }, { status: 404 });
}
+ if (account.deletedAt) {
+ return NextResponse.json({ error: "This account is deleted. Restore it first" }, { status: 409 });
+ }
const actor = access.user!;
const actorIsPrimary = isPrimaryAdmin(actor);
if (!actorIsPrimary && !canManageUsers(actor)) {
diff --git a/src/app/api/accounts/route.ts b/src/app/api/accounts/route.ts
index 7a0269f..379eabe 100644
--- a/src/app/api/accounts/route.ts
+++ b/src/app/api/accounts/route.ts
@@ -4,6 +4,7 @@ import { createUserAccountSchema } from "@/lib/validators";
import { canManageUsers, isPrimaryAdmin } from "@/lib/auth/admin";
import { getLicenseEntitlements } from "@/lib/licenses/service";
import { countUsedAccountSeats } from "@/lib/licenses/seats";
+import { deleteAccounts } from "@/lib/accounts/deletion";
import { createAccountResponse } from "./create";
import { accountListItemFromUser, listAccountsForAdmin, requireTeamAdmin } from "./utils";
@@ -34,3 +35,14 @@ export async function POST(request: Request) {
}
return createAccountResponse(access.env, actor.id, parsed.data);
}
+
+export async function DELETE(request: Request) {
+ const access = await requireTeamAdmin(request);
+ if (access.error) return access.error;
+ const body = (await request.json().catch(() => null)) as { ids?: unknown; transferToId?: unknown } | null;
+ const ids = Array.isArray(body?.ids) ? body.ids.filter((id): id is string => typeof id === "string" && !!id) : [];
+ const transferToId = typeof body?.transferToId === "string" ? body.transferToId : null;
+ const result = await deleteAccounts(access.env, access.user!, { ids, transferToId });
+ if (!result.ok) return NextResponse.json({ error: result.error }, { status: result.status });
+ return NextResponse.json({ ok: true, deleted: result.deleted });
+}
diff --git a/src/app/api/accounts/utils.ts b/src/app/api/accounts/utils.ts
index d42503d..321f730 100644
--- a/src/app/api/accounts/utils.ts
+++ b/src/app/api/accounts/utils.ts
@@ -24,6 +24,8 @@ export function listAccountsForAdmin(db: Db) {
canManageDomains: users.canManageDomains,
canManageUsers: users.canManageUsers,
createdAt: users.createdAt,
+ lastSignInAt: users.lastSignInAt,
+ deletedAt: users.deletedAt,
})
.from(users)
.orderBy(desc(users.createdAt));
@@ -60,6 +62,8 @@ export function accountListItemFromUser(user: {
canManageDomains?: boolean;
canManageUsers?: boolean;
createdAt: Date;
+ lastSignInAt?: Date | null;
+ deletedAt?: Date | null;
}) {
return {
id: user.id,
@@ -74,6 +78,8 @@ export function accountListItemFromUser(user: {
canManageDomains: !!user.canManageDomains,
canManageUsers: !!user.canManageUsers,
createdAt: user.createdAt,
+ lastSignInAt: user.lastSignInAt ?? null,
+ deletedAt: user.deletedAt ?? null,
};
}
diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.ts
index b7b0dc8..5430ee0 100644
--- a/src/app/api/auth/login/route.ts
+++ b/src/app/api/auth/login/route.ts
@@ -43,7 +43,7 @@ export async function POST(request: Request) {
if (!user || !verifyPassword(parsed.data.password, user.passwordHash)) {
return NextResponse.json({ error: "Invalid credentials" }, { status: 401 });
}
- if (user.disabled) {
+ if (user.disabled || user.deletedAt) {
return NextResponse.json({ error: "Account disabled" }, { status: 403 });
}
diff --git a/src/components/dashboard-nav.tsx b/src/components/dashboard-nav.tsx
index dd3f549..f443b21 100644
--- a/src/components/dashboard-nav.tsx
+++ b/src/components/dashboard-nav.tsx
@@ -97,7 +97,7 @@ function NavToggle({ expanded, onClick, collapsedLabel, expandedLabel }: { expan
export function DashboardNav({ className }: { className?: string }) {
const { t } = useLanguage();
- const { minimal } = useSidebar();
+ const { minimal, mobile } = useSidebar();
const pathname = usePathname();
const [moreOpen, setMoreOpen] = useState(false);
const [foldersOpen, setFoldersOpen] = useState(false);
@@ -234,7 +234,7 @@ export function DashboardNav({ className }: { className?: string }) {
return (
<SidebarScaffold className={className} header={<SidebarHeader href="/inbox" />} footer={<SidebarFooter />}>
- {composeLink && <NavItem labelClassName="font-medium" link={composeLink} />}
+ {composeLink && !mobile && <NavItem labelClassName="font-medium" link={composeLink} />}
{minimal && <hr className="mx-6 my-2 border-neutral-200/70" />}
<ReorderableList
storageKey="mailflare:nav:layout"
diff --git a/src/components/header-search-types.d.ts b/src/components/header-search-types.d.ts
index 15fc138..5898532 100644
--- a/src/components/header-search-types.d.ts
+++ b/src/components/header-search-types.d.ts
@@ -8,4 +8,6 @@ export type HeaderSearchProps = {
onSubmit?: () => void;
trailing?: ReactNode;
inputProps?: Record<string, string>;
+ // On phones, park the collapsed search icon at the right end of the header.
+ mobileEnd?: boolean;
};
diff --git a/src/components/header-search.tsx b/src/components/header-search.tsx
index ff45c44..122f656 100644
--- a/src/components/header-search.tsx
+++ b/src/components/header-search.tsx
@@ -9,7 +9,7 @@ import type { HeaderSearchProps } from "./header-search-types";
// The header search shared by every layout. On phones it is an icon beside the menu button
// until tapped, then covers the header at full width; the wrapper still fills the row so
// whatever follows it stays pushed to the right.
-export function HeaderSearch({ value, onChange, label, placeholder, onSubmit, trailing, inputProps }: HeaderSearchProps) {
+export function HeaderSearch({ value, onChange, label, placeholder, onSubmit, trailing, inputProps, mobileEnd }: HeaderSearchProps) {
const [expanded, setExpanded] = useState(false);
const inputRef = useRef<HTMLInputElement>(null);
@@ -18,7 +18,7 @@ export function HeaderSearch({ value, onChange, label, placeholder, onSubmit, tr
}, [expanded]);
return (
- <div className="flex min-w-0 flex-1 items-center">
+ <div className={clsx("flex min-w-0 flex-1 items-center", mobileEnd && !expanded && "max-md:justify-end")}>
<button
type="button"
onClick={() => setExpanded(true)}
diff --git a/src/components/mail-search/mail-search-input.tsx b/src/components/mail-search/mail-search-input.tsx
index 44f9aa7..84bc34b 100644
--- a/src/components/mail-search/mail-search-input.tsx
+++ b/src/components/mail-search/mail-search-input.tsx
@@ -6,7 +6,7 @@ import { HeaderSearch } from "@/components/header-search";
import { useMailSearch } from "./mail-search-context";
import { useShortcuts } from "@/components/shortcuts";
-export function MailSearchInput() {
+export function MailSearchInput({ mobileEnd }: { mobileEnd?: boolean }) {
const { t } = useLanguage();
const { input: query, setQuery } = useMailSearch();
const { openCommandPalette, shortcutsEnabled, shortcutsPreferenceLoading } = useShortcuts();
@@ -17,6 +17,7 @@ export function MailSearchInput() {
value={query}
onChange={setQuery}
label={t("search.mail")}
+ mobileEnd={mobileEnd}
placeholder={showShortcutHints ? t("search.mailHint") : t("search.mail")}
inputProps={{ "data-mail-search-input": "" }}
trailing={query ? (
diff --git a/src/components/sidebar-aside.tsx b/src/components/sidebar-aside.tsx
index 34b4e4c..71c5cef 100644
--- a/src/components/sidebar-aside.tsx
+++ b/src/components/sidebar-aside.tsx
@@ -2,10 +2,12 @@
import clsx from "clsx";
import { Menu } from "lucide-react";
+import Link from "next/link";
import { useEffect } from "react";
import type { ReactNode } from "react";
import { useSidebar } from "./sidebar-state";
import { useLanguage } from "./language-provider";
+import { useBranding } from "./branding-provider";
export function SidebarAside({ children, className }: { children: ReactNode; className?: string }) {
const { mobile, mobileOpen, toggle } = useSidebar();
@@ -47,12 +49,18 @@ export function SidebarAside({ children, className }: { children: ReactNode; cla
export function MobileMenuButton({ className }: { className?: string }) {
const { t } = useLanguage();
+ const branding = useBranding();
const { mobile, mobileOpen, toggle } = useSidebar();
if (!mobile) return null;
return (
- <button type="button" data-mobile-menu onClick={toggle} aria-label={t("navigation.openMenu")} aria-expanded={mobileOpen} className={clsx("flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200 md:hidden", className)}>
- <Menu size={20} />
- </button>
+ <>
+ <button type="button" data-mobile-menu onClick={toggle} aria-label={t("navigation.openMenu")} aria-expanded={mobileOpen} className={clsx("flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200 md:hidden", className)}>
+ <Menu size={20} />
+ </button>
+ <Link href="/inbox" aria-label={t("navigation.inbox")} className="-ml-2 flex h-10 w-10 shrink-0 items-center justify-center rounded-full hover:bg-neutral-200 md:hidden">
+ <img src={branding.iconUrl} height={28} width={28} alt="" />
+ </Link>
+ </>
);
}
diff --git a/src/db/schema/index.ts b/src/db/schema/index.ts
index 66d2c6b..643789d 100644
--- a/src/db/schema/index.ts
+++ b/src/db/schema/index.ts
@@ -34,6 +34,10 @@ export const users = sqliteTable("users", {
totpSecret: text("totp_secret"),
totpEnabled: integer("totp_enabled", { mode: "boolean" }).notNull().default(false),
totpConfirmedAt: integer("totp_confirmed_at", { mode: "timestamp" }),
+ lastSignInAt: integer("last_sign_in_at", { mode: "timestamp" }),
+ // Set when an admin deletes the account. The account is also `disabled` and can be restored until the
+ // retention window ends, after which the scheduled purge removes it and its data.
+ deletedAt: integer("deleted_at", { mode: "timestamp" }),
createdByUserId: text("created_by_user_id").references((): AnySQLiteColumn => users.id, { onDelete: "set null" }),
createdAt: integer("created_at", { mode: "timestamp" })
.notNull()
diff --git a/src/lib/accounts/deletion-types.d.ts b/src/lib/accounts/deletion-types.d.ts
new file mode 100644
index 0000000..9327b5f
--- /dev/null
+++ b/src/lib/accounts/deletion-types.d.ts
@@ -0,0 +1,8 @@
+export type DeleteAccountsInput = {
+ ids: string[];
+ transferToId?: string | null;
+};
+
+export type DeleteAccountsResult =
+ | { ok: true; deleted: number }
+ | { ok: false; status: number; error: string };
diff --git a/src/lib/accounts/deletion-utils.ts b/src/lib/accounts/deletion-utils.ts
new file mode 100644
index 0000000..7826b5e
--- /dev/null
+++ b/src/lib/accounts/deletion-utils.ts
@@ -0,0 +1,18 @@
+export const ACCOUNT_RESTORE_DAYS = 20;
+
+const DAY_MS = 24 * 60 * 60_000;
+
+/** Last moment a deleted account can still be restored. */
+export function getAccountPurgeDate(deletedAt: Date): Date {
+ return new Date(deletedAt.getTime() + ACCOUNT_RESTORE_DAYS * DAY_MS);
+}
+
+/** Cutoff for the scheduled purge: accounts deleted at or before this are removed for good. */
+export function getAccountPurgeCutoff(now: Date): Date {
+ return new Date(now.getTime() - ACCOUNT_RESTORE_DAYS * DAY_MS);
+}
+
+export function getAccountStatus(account: { disabled: boolean; deletedAt?: Date | string | null }): "active" | "disabled" | "pendingDeletion" {
+ if (account.deletedAt) return "pendingDeletion";
+ return account.disabled ? "disabled" : "active";
+}
diff --git a/src/lib/accounts/deletion.ts b/src/lib/accounts/deletion.ts
new file mode 100644
index 0000000..234175b
--- /dev/null
+++ b/src/lib/accounts/deletion.ts
@@ -0,0 +1,130 @@
+import { and, eq, inArray, isNotNull, isNull, lte } from "drizzle-orm";
+import { getDb } from "@/db";
+import { calendarEvents, driveItems, mailboxes, messageAttachments, messages, sessions, users } from "@/db/schema";
+import { canManageUsers, isPrimaryAdmin } from "@/lib/auth/admin";
+import type { SessionUser } from "@/lib/auth/types";
+import { deleteDriveItems } from "@/lib/drive/access";
+import { driveObjectKey } from "@/lib/drive/utils";
+import { newId } from "@/lib/ids";
+import { getAccountSeatError } from "@/lib/licenses/seats";
+import { removeMailboxDomainRouting } from "@/lib/mailboxes/domain-addresses";
+import { avatarKeyFor } from "@/app/api/profile/avatar/utils";
+import { getAccountPurgeCutoff } from "./deletion-utils";
+import type { DeleteAccountsInput, DeleteAccountsResult } from "./deletion-types";
+
+const CHUNK = 50;
+
+function chunks<T>(items: T[], size = CHUNK): T[][] {
+ const out: T[][] = [];
+ for (let index = 0; index < items.length; index += size) out.push(items.slice(index, index + size));
+ return out;
+}
+
+/**
+ * Moves Drive files (documents included) and calendar events from one account to another. Drive items that sat at
+ * the top level go into a folder on the receiving account so they do not mix with its own files.
+ */
+export async function transferAccountData(env: CloudflareEnv, fromId: string, fromName: string, toId: string): Promise<void> {
+ const db = getDb(env);
+ const items = await db.select().from(driveItems).where(eq(driveItems.ownerId, fromId));
+ if (items.length) {
+ // Stored objects are keyed by owner unless the row records its key, so pin the key before the owner changes.
+ for (const row of items) {
+ if (row.kind === "file" && !row.r2Key) await db.update(driveItems).set({ r2Key: driveObjectKey(fromId, row.id) }).where(eq(driveItems.id, row.id));
+ }
+ const folderId = newId();
+ await db.insert(driveItems).values({ id: folderId, ownerId: toId, parentId: null, kind: "folder", name: `Files from ${fromName}`.slice(0, 255) });
+ const rootIds = items.filter((row) => !row.parentId).map((row) => row.id);
+ for (const ids of chunks(rootIds)) await db.update(driveItems).set({ parentId: folderId }).where(inArray(driveItems.id, ids));
+ await db.update(driveItems).set({ ownerId: toId }).where(and(eq(driveItems.ownerId, fromId), isNull(driveItems.uploadId)));
+ }
+ await db.update(calendarEvents).set({ userId: toId }).where(eq(calendarEvents.userId, fromId));
+}
+
+/**
+ * Soft-deletes accounts: they are disabled, signed out and stamped with `deletedAt`. They can be restored until the
+ * scheduled purge removes them after the retention window. Optionally hands their Drive and calendar data to another account.
+ */
+export async function deleteAccounts(env: CloudflareEnv, actor: SessionUser, input: DeleteAccountsInput): Promise<DeleteAccountsResult> {
+ if (!canManageUsers(actor)) return { ok: false, status: 403, error: "You do not have permission to manage users" };
+ const ids = [...new Set(input.ids)];
+ if (!ids.length) return { ok: false, status: 400, error: "Select at least one account" };
+ const db = getDb(env);
+ const targets: (typeof users.$inferSelect)[] = [];
+ for (const group of chunks(ids)) targets.push(...(await db.select().from(users).where(inArray(users.id, group))));
+ if (targets.length !== ids.length) return { ok: false, status: 404, error: "Account not found" };
+ for (const target of targets) {
+ if (target.id === actor.id) return { ok: false, status: 400, error: "You cannot delete your own account" };
+ if (target.isPrimaryAdmin) return { ok: false, status: 403, error: "The primary admin cannot be deleted" };
+ if (!isPrimaryAdmin(actor) && target.role === "admin") return { ok: false, status: 403, error: "Only the primary admin can manage admin accounts" };
+ if (target.deletedAt) return { ok: false, status: 409, error: `${target.email} is already deleted` };
+ }
+ const transferToId = input.transferToId || null;
+ if (transferToId) {
+ const [recipient] = await db.select().from(users).where(eq(users.id, transferToId)).limit(1);
+ if (!recipient || recipient.disabled || recipient.deletedAt || ids.includes(recipient.id)) {
+ return { ok: false, status: 400, error: "Choose an active account to transfer data to" };
+ }
+ if (!isPrimaryAdmin(actor) && recipient.role === "admin" && recipient.id !== actor.id) {
+ return { ok: false, status: 403, error: "Only the primary admin can transfer data to an admin account" };
+ }
+ for (const target of targets) await transferAccountData(env, target.id, target.name || target.email, recipient.id);
+ }
+ const now = new Date();
+ for (const group of chunks(ids)) {
+ await db.update(users).set({ deletedAt: now, disabled: true }).where(inArray(users.id, group));
+ await db.delete(sessions).where(inArray(sessions.userId, group));
+ }
+ return { ok: true, deleted: ids.length };
+}
+
+export async function restoreAccount(env: CloudflareEnv, actor: SessionUser, id: string): Promise<DeleteAccountsResult> {
+ if (!canManageUsers(actor)) return { ok: false, status: 403, error: "You do not have permission to manage users" };
+ const db = getDb(env);
+ const [target] = await db.select().from(users).where(eq(users.id, id)).limit(1);
+ if (!target) return { ok: false, status: 404, error: "Account not found" };
+ if (!target.deletedAt) return { ok: false, status: 409, error: "Account is not deleted" };
+ if (!isPrimaryAdmin(actor) && target.role === "admin") return { ok: false, status: 403, error: "Only the primary admin can manage admin accounts" };
+ const seatError = await getAccountSeatError(env);
+ if (seatError) return { ok: false, status: 403, error: seatError };
+ await db.update(users).set({ deletedAt: null, disabled: false }).where(eq(users.id, id));
+ return { ok: true, deleted: 0 };
+}
+
+async function purgeAccount(env: CloudflareEnv, account: typeof users.$inferSelect): Promise<void> {
+ const db = getDb(env);
+ const owned = await db.select().from(mailboxes).where(eq(mailboxes.userId, account.id));
+ for (const mailbox of owned) {
+ try {
+ await removeMailboxDomainRouting(env, db, mailbox);
+ } catch (error) {
+ console.error("Account purge: could not remove routing", { mailboxId: mailbox.id, error });
+ }
+ }
+ const rootItems = await db.select().from(driveItems).where(and(eq(driveItems.ownerId, account.id), isNull(driveItems.parentId)));
+ if (rootItems.length) await deleteDriveItems(env, rootItems);
+ for (const mailbox of owned) {
+ const raw = await db.select({ key: messages.rawR2Key }).from(messages).where(and(eq(messages.mailboxId, mailbox.id), isNotNull(messages.rawR2Key)));
+ const attachments = await db.select({ key: messageAttachments.r2Key }).from(messageAttachments).innerJoin(messages, eq(messages.id, messageAttachments.messageId)).where(eq(messages.mailboxId, mailbox.id));
+ const keys = [...raw.map((row) => row.key), ...attachments.map((row) => row.key)].filter((key): key is string => !!key);
+ for (const group of chunks(keys, 500)) await env.BUCKET.delete(group);
+ }
+ await env.BUCKET.delete(account.avatarKey ?? avatarKeyFor(account.id));
+ await db.delete(users).where(eq(users.id, account.id));
+}
+
+/** Removes accounts whose restore window has ended, with their data. Runs from the daily scheduled handler. */
+export async function runAccountRetention(env: CloudflareEnv, now = new Date()): Promise<number> {
+ const db = getDb(env);
+ const expired = await db.select().from(users).where(and(isNotNull(users.deletedAt), lte(users.deletedAt, getAccountPurgeCutoff(now)))).limit(20);
+ let removed = 0;
+ for (const account of expired) {
+ try {
+ await purgeAccount(env, account);
+ removed += 1;
+ } catch (error) {
+ console.error("Account purge failed", { userId: account.id, error });
+ }
+ }
+ return removed;
+}
diff --git a/src/lib/auth/session.ts b/src/lib/auth/session.ts
index eb1195d..4551a8e 100644
--- a/src/lib/auth/session.ts
+++ b/src/lib/auth/session.ts
@@ -29,6 +29,7 @@ export async function createSession(env: CloudflareEnv, userId: string): Promise
tokenHash,
expiresAt,
});
+ await db.update(users).set({ lastSignInAt: new Date() }).where(eq(users.id, userId));
return token;
}
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index 3eb53f0..99bbe6d 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -934,6 +934,28 @@
"accounts.roleAdmin": "Admin",
"accounts.creating": "Creating...",
"accounts.create": "Create account",
+ "accounts.colAccount": "Account",
+ "accounts.colStatus": "Status",
+ "accounts.colLastSignIn": "Last sign in",
+ "accounts.neverSignedIn": "Never",
+ "accounts.status.active": "Active",
+ "accounts.status.disabled": "Disabled",
+ "accounts.status.pendingDeletion": "Deletes {date}",
+ "accounts.selectAll": "Select all accounts",
+ "accounts.selectOne": "Select {name}",
+ "accounts.moreActions": "More actions",
+ "accounts.deleteSelected": "Delete selected accounts",
+ "accounts.deleteTitle": "Delete {count} account(s)",
+ "accounts.deleteDescription": "The accounts are disabled right away and can be restored for {days} days. After that the accounts and all their data are permanently removed.",
+ "accounts.transferLabel": "Transfer Drive, Docs and Calendar data (optional)",
+ "accounts.transferNone": "Do not transfer",
+ "accounts.transferHint": "Files, documents and calendar events move to the chosen account. Mail stays with the deleted account.",
+ "accounts.confirmDelete": "Confirm deletion",
+ "accounts.deleting": "Deleting...",
+ "accounts.deleteFailed": "Unable to delete accounts",
+ "accounts.restore": "Restore",
+ "accounts.restoreAccount": "Restore {name}",
+ "accounts.restoreFailed": "Unable to restore account",
"aliases.useAll": "Use all domains",
"aliases.useAllHint": "Use this username on every available domain, including domains added later. When off, only the primary address and the aliases below are assigned.",
"aliases.additional": "Additional aliases",
@@ -1935,7 +1957,7 @@
"drive.from": "From",
"drive.storageOf": "{used} of {total} used",
"drive.storageBar": "Storage used",
- "drive.trashNotice": "Items in the trash are deleted forever after {days} days. Email attachments you trash are hidden from their email until restored.",
+ "drive.trashNotice": "Items in the trash are deleted forever after {days} days.",
"drive.folderCreated": "Folder created",
"drive.sharedWithMe": "Shared with me",
"drive.trash": "Trash",
diff --git a/worker.ts b/worker.ts
index 3477723..02527c4 100644
--- a/worker.ts
+++ b/worker.ts
@@ -22,6 +22,7 @@ import { processAgentDraftJob } from "./src/lib/agent/jobs/utils";
import { runAgentMaintenance } from "./src/lib/agent/maintenance";
import { runTrashRetention } from "./src/lib/email/trash-retention";
import { runDriveTrashRetention } from "./src/lib/drive/retention";
+import { runAccountRetention } from "./src/lib/accounts/deletion";
export { RealtimeHub } from "./src/lib/realtime/hub";
export default {
@@ -132,6 +133,7 @@ export default {
if (controller.cron === "0 2 * * *") ctx.waitUntil(runScheduledDatabaseBackup(env, new Date(controller.scheduledTime)));
ctx.waitUntil(runAgentMaintenance(env));
ctx.waitUntil(runTrashRetention(env, new Date(controller.scheduledTime)));
+ if (controller.cron === "0 2 * * *") ctx.waitUntil(runAccountRetention(env, new Date(controller.scheduledTime)));
// Drive trash is emptied once a day, with the 02:00 UTC cron; the 5-minute cron is for queue-like upkeep.
if (controller.cron === "0 2 * * *") ctx.waitUntil(runDriveTrashRetention(env, new Date(controller.scheduledTime)));
},