Skip to content

Email for professionals and teams

Improve contact profile

Hieu Nguyen (Jack)2558d68d4aad
diff --git a/src/app/api/contacts/avatar/route.ts b/src/app/api/contacts/avatar/route.ts
index a9a1d2c..5d77430 100644
--- a/src/app/api/contacts/avatar/route.ts
+++ b/src/app/api/contacts/avatar/route.ts
@@ -10,8 +10,10 @@ import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
import {
ALLOWED_AVATAR_TYPES,
MAX_AVATAR_SIZE,
+ avatarKeyFor,
isUploadedAvatarFile,
} from "@/app/api/profile/avatar/utils";
+import { getPersonalIdentityForAddress, syncPersonalIdentity } from "@/lib/profile/sync";
import { contactAvatarKeyFor } from "./utils";
export async function GET(request: Request) {
@@ -25,14 +27,16 @@ export async function GET(request: Request) {
const db = getDb(env);
const access = await getMailboxAccessLevel(db, user, mailboxId);
if (!access?.canRead) return new Response("Not found", { status: 404 });
+ const account = await getPersonalIdentityForAddress(db, access.mailbox.userId, email);
const [contact] = await db
.select({ avatarKey: contacts.avatarKey })
.from(contacts)
.where(and(eq(contacts.userId, access.mailbox.userId), eq(contacts.email, email)))
.limit(1);
- if (!contact?.avatarKey) return new Response("Not found", { status: 404 });
+ const avatarKey = account ? account.avatarKey : contact?.avatarKey;
+ if (!avatarKey) return new Response("Not found", { status: 404 });
- const object = await env.BUCKET.get(contact.avatarKey);
+ const object = await env.BUCKET.get(avatarKey);
if (!object) return new Response("Not found", { status: 404 });
const headers = new Headers();
headers.set("Content-Type", object.httpMetadata?.contentType ?? "application/octet-stream");
@@ -69,6 +73,18 @@ export async function POST(request: Request) {
const db = getDb(env);
const access = await getMailboxAccessLevel(db, user, mailboxId);
if (!access?.canManage) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
+ const account = await getPersonalIdentityForAddress(db, access.mailbox.userId, email);
+ if (account) {
+ if (account.userId !== user.id) {
+ return NextResponse.json({ error: "Only the account owner can change this contact" }, { status: 403 });
+ }
+ const key = avatarKeyFor(account.userId);
+ await env.BUCKET.put(key, await file.arrayBuffer(), {
+ httpMetadata: { contentType: file.type },
+ });
+ await syncPersonalIdentity(db, { ...account, avatarKey: key });
+ return NextResponse.json({ ok: true });
+ }
const [existing] = await db
.select({ id: contacts.id })
.from(contacts)
@@ -105,6 +121,15 @@ export async function DELETE(request: Request) {
const db = getDb(env);
const access = await getMailboxAccessLevel(db, user, mailboxId);
if (!access?.canManage) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
+ const account = await getPersonalIdentityForAddress(db, access.mailbox.userId, email);
+ if (account) {
+ if (account.userId !== user.id) {
+ return NextResponse.json({ error: "Only the account owner can change this contact" }, { status: 403 });
+ }
+ if (account.avatarKey) await env.BUCKET.delete(account.avatarKey);
+ await syncPersonalIdentity(db, { ...account, avatarKey: null });
+ return NextResponse.json({ ok: true });
+ }
const [contact] = await db
.select({ avatarKey: contacts.avatarKey })
.from(contacts)
diff --git a/src/app/api/contacts/avatar/utils.ts b/src/app/api/contacts/avatar/utils.ts
index 1436585..2dc3fa5 100644
--- a/src/app/api/contacts/avatar/utils.ts
+++ b/src/app/api/contacts/avatar/utils.ts
@@ -1,3 +1 @@
-export function contactAvatarKeyFor(userId: string, email: string): string {
- return `contact-avatars/${userId}/${encodeURIComponent(email.trim().toLowerCase())}`;
-}
+export { contactAvatarKeyFor } from "@/lib/contacts/avatar";
diff --git a/src/app/api/contacts/route.ts b/src/app/api/contacts/route.ts
index e917456..ab17a2f 100644
--- a/src/app/api/contacts/route.ts
+++ b/src/app/api/contacts/route.ts
@@ -4,6 +4,7 @@ import { requireUser } from "@/lib/auth/cookies";
import { getEnv } from "@/lib/cloudflare";
import { normalizeEmailAddress } from "@/lib/email/address";
import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
+import { getPersonalIdentityForAddress, syncPersonalIdentity } from "@/lib/profile/sync";
import type { ContactRequestInput } from "./types";
import { getContactByEmail, saveManualContactName, toContactDetails } from "./utils";
@@ -22,7 +23,19 @@ export async function GET(request: Request) {
if (!access?.canRead) {
return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
}
- const contact = toContactDetails(await getContactByEmail(db, access.mailbox.userId, email));
+ const storedContact = toContactDetails(await getContactByEmail(db, access.mailbox.userId, email));
+ const account = await getPersonalIdentityForAddress(db, access.mailbox.userId, email);
+ const contact = account
+ ? {
+ ...(storedContact ?? {}),
+ email,
+ displayName: account.name,
+ hasAvatar: !!account.avatarKey,
+ source: "manual" as const,
+ blocked: storedContact?.blocked ?? false,
+ lastSeenAt: storedContact?.lastSeenAt ?? null,
+ }
+ : storedContact;
return NextResponse.json({
contact: contact ?? {
email,
@@ -50,6 +63,17 @@ export async function PATCH(request: Request) {
if (!access?.canManage) {
return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
}
+ const account = await getPersonalIdentityForAddress(db, access.mailbox.userId, email);
+ if (account) {
+ if (account.userId !== user.id) {
+ return NextResponse.json({ error: "Only the account owner can change this contact" }, { status: 403 });
+ }
+ await syncPersonalIdentity(db, {
+ userId: account.userId,
+ name: displayName,
+ avatarKey: account.avatarKey,
+ });
+ }
const contact = toContactDetails(await saveManualContactName(db, {
userId: access.mailbox.userId,
email,
diff --git a/src/app/api/mailboxes/[id]/avatar/route.ts b/src/app/api/mailboxes/[id]/avatar/route.ts
index 01621e9..dda888f 100644
--- a/src/app/api/mailboxes/[id]/avatar/route.ts
+++ b/src/app/api/mailboxes/[id]/avatar/route.ts
@@ -1,15 +1,17 @@
import { eq } from "drizzle-orm";
import { NextResponse } from "next/server";
import { getDb } from "@/db";
-import { mailboxes } from "@/db/schema";
+import { mailboxes, users } from "@/db/schema";
import { requireUser } from "@/lib/auth/cookies";
import { getEnv } from "@/lib/cloudflare";
import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
import {
ALLOWED_AVATAR_TYPES,
MAX_AVATAR_SIZE,
+ avatarKeyFor,
isUploadedAvatarFile,
} from "@/app/api/profile/avatar/utils";
+import { syncPersonalIdentity } from "@/lib/profile/sync";
import type { MailboxAvatarRouteParams } from "./types";
import { mailboxAvatarKeyFor } from "./utils";
@@ -22,13 +24,19 @@ export async function GET(request: Request, { params }: MailboxAvatarRouteParams
if (!access?.canRead) return new Response("Not found", { status: 404 });
const [mailbox] = await db
- .select({ avatarKey: mailboxes.avatarKey })
+ .select({
+ avatarKey: mailboxes.avatarKey,
+ type: mailboxes.type,
+ ownerAvatarKey: users.avatarKey,
+ })
.from(mailboxes)
+ .innerJoin(users, eq(mailboxes.userId, users.id))
.where(eq(mailboxes.id, id))
.limit(1);
- if (!mailbox?.avatarKey) return new Response("Not found", { status: 404 });
+ const avatarKey = mailbox?.type === "personal" ? mailbox.ownerAvatarKey : mailbox?.avatarKey;
+ if (!avatarKey) return new Response("Not found", { status: 404 });
- const object = await env.BUCKET.get(mailbox.avatarKey);
+ const object = await env.BUCKET.get(avatarKey);
if (!object) return new Response("Not found", { status: 404 });
const headers = new Headers();
@@ -66,10 +74,26 @@ export async function POST(request: Request, { params }: MailboxAvatarRouteParam
return NextResponse.json({ error: "Image must be 2 MB or smaller" }, { status: 413 });
}
- const key = mailboxAvatarKeyFor(id);
+ const [mailbox] = await db
+ .select({ userId: mailboxes.userId, type: mailboxes.type, ownerName: users.name })
+ .from(mailboxes)
+ .innerJoin(users, eq(mailboxes.userId, users.id))
+ .where(eq(mailboxes.id, id))
+ .limit(1);
+ if (!mailbox) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
+
+ const key = mailbox.type === "personal" ? avatarKeyFor(mailbox.userId) : mailboxAvatarKeyFor(id);
await env.BUCKET.put(key, await file.arrayBuffer(), {
httpMetadata: { contentType: file.type },
});
- await db.update(mailboxes).set({ avatarKey: key }).where(eq(mailboxes.id, id));
+ if (mailbox.type === "personal") {
+ await syncPersonalIdentity(db, {
+ userId: mailbox.userId,
+ name: mailbox.ownerName,
+ avatarKey: key,
+ });
+ } else {
+ await db.update(mailboxes).set({ avatarKey: key }).where(eq(mailboxes.id, id));
+ }
return NextResponse.json({ ok: true });
}
diff --git a/src/app/api/mailboxes/[id]/route.ts b/src/app/api/mailboxes/[id]/route.ts
index 64860d4..586fbcc 100644
--- a/src/app/api/mailboxes/[id]/route.ts
+++ b/src/app/api/mailboxes/[id]/route.ts
@@ -6,6 +6,7 @@ import { requireUser } from "@/lib/auth/cookies";
import { getEnv } from "@/lib/cloudflare";
import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
import { ensureMailboxDomainRouting, removeMailboxDomainRouting } from "@/lib/mailboxes/domain-addresses";
+import { syncPersonalIdentity } from "@/lib/profile/sync";
import { updateMailboxSchema } from "@/lib/validators";
import type { MailboxRouteParams } from "./types";
import { getMailboxUpdateValues, selectMailboxForUser } from "./utils";
@@ -24,12 +25,14 @@ export async function GET(request: Request, { params }: MailboxRouteParams) {
if (!mailbox) {
return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
}
- const { avatarKey, ...mailboxDetails } = mailbox;
+ const { avatarKey, ownerName, ownerAvatarKey, ...mailboxDetails } = mailbox;
+ const personal = mailbox.type === "personal";
return NextResponse.json({
mailbox: {
...mailboxDetails,
- hasAvatar: !!avatarKey,
+ displayName: personal ? ownerName : mailbox.displayName,
+ hasAvatar: personal ? !!ownerAvatarKey : !!avatarKey,
permission: access.permission,
isPrimary: `${mailbox.localPart}@${mailbox.hostname}` === user.email,
},
@@ -55,6 +58,18 @@ export async function PATCH(request: Request, { params }: MailboxRouteParams) {
}
const updateValues = getMailboxUpdateValues(parsed.data);
+ if (existing.type === "personal" && "displayName" in parsed.data) {
+ const name = parsed.data.displayName?.trim();
+ if (!name) {
+ return NextResponse.json({ error: "A valid account name is required" }, { status: 400 });
+ }
+ await syncPersonalIdentity(db, {
+ userId: existing.userId,
+ name,
+ avatarKey: existing.ownerAvatarKey,
+ });
+ delete updateValues.displayName;
+ }
if (parsed.data.useAllDomains === true) {
try {
await ensureMailboxDomainRouting(env, db, {
@@ -79,12 +94,14 @@ export async function PATCH(request: Request, { params }: MailboxRouteParams) {
}
const [mailbox] = await selectMailboxForUser(db, user.id, id);
- const { avatarKey, ...mailboxDetails } = mailbox!;
+ const { avatarKey, ownerName, ownerAvatarKey, ...mailboxDetails } = mailbox!;
+ const personal = mailbox!.type === "personal";
return NextResponse.json({
mailbox: {
...mailboxDetails,
- hasAvatar: !!avatarKey,
+ displayName: personal ? ownerName : mailbox!.displayName,
+ hasAvatar: personal ? !!ownerAvatarKey : !!avatarKey,
permission: access.permission,
isPrimary: `${mailbox!.localPart}@${mailbox!.hostname}` === user.email,
},
diff --git a/src/app/api/mailboxes/[id]/utils.ts b/src/app/api/mailboxes/[id]/utils.ts
index a53bc32..7ec5fb2 100644
--- a/src/app/api/mailboxes/[id]/utils.ts
+++ b/src/app/api/mailboxes/[id]/utils.ts
@@ -1,5 +1,5 @@
import { eq } from "drizzle-orm";
-import { domains, mailboxes } from "@/db/schema";
+import { domains, mailboxes, users } from "@/db/schema";
import type { getDb } from "@/db";
import type { MailboxUpdateValues } from "./types";
@@ -19,6 +19,8 @@ export function selectMailboxForUser(db: Db, userId: string, mailboxId: string)
autoReplyBody: mailboxes.autoReplyBody,
useAllDomains: mailboxes.useAllDomains,
avatarKey: mailboxes.avatarKey,
+ ownerName: users.name,
+ ownerAvatarKey: users.avatarKey,
type: mailboxes.type,
disabled: mailboxes.disabled,
createdAt: mailboxes.createdAt,
@@ -26,6 +28,7 @@ export function selectMailboxForUser(db: Db, userId: string, mailboxId: string)
})
.from(mailboxes)
.innerJoin(domains, eq(mailboxes.domainId, domains.id))
+ .innerJoin(users, eq(mailboxes.userId, users.id))
.where(eq(mailboxes.id, mailboxId))
.limit(1);
}
diff --git a/src/app/api/mailboxes/route.ts b/src/app/api/mailboxes/route.ts
index c76659b..fcd1721 100644
--- a/src/app/api/mailboxes/route.ts
+++ b/src/app/api/mailboxes/route.ts
@@ -19,6 +19,9 @@ export async function GET(request: Request) {
return NextResponse.json({
mailboxes: await Promise.all(rows.map(async (mailbox) => ({
...mailbox,
+ ...(mailbox.userId === user.id && mailbox.type === "personal"
+ ? { displayName: user.name, hasAvatar: !!user.avatarKey }
+ : {}),
senderAddresses: await getMailboxDomainAddresses(db, mailbox),
}))),
canCreateShared: user.role === "admin" && entitlements.canManageAccounts,
diff --git a/src/app/api/messages/route.ts b/src/app/api/messages/route.ts
index a05172d..7025385 100644
--- a/src/app/api/messages/route.ts
+++ b/src/app/api/messages/route.ts
@@ -175,7 +175,9 @@ export async function GET(request: Request) {
const mailboxNameMap = new Map(
accessibleMailboxes.map((mailbox) => [
mailbox.id,
- mailbox.displayName ?? mailbox.localPart,
+ mailbox.userId === user.id && mailbox.type === "personal"
+ ? user.name
+ : mailbox.displayName ?? mailbox.localPart,
]),
);
const contactMapsByUserId = new Map(
diff --git a/src/app/api/profile/avatar/route.ts b/src/app/api/profile/avatar/route.ts
index 79473f5..28d355f 100644
--- a/src/app/api/profile/avatar/route.ts
+++ b/src/app/api/profile/avatar/route.ts
@@ -1,9 +1,8 @@
import { NextResponse } from "next/server";
-import { eq } from "drizzle-orm";
import { getDb } from "@/db";
-import { users } from "@/db/schema";
import { getCurrentUser } from "@/lib/auth/cookies";
import { getEnv } from "@/lib/cloudflare";
+import { syncPersonalIdentity } from "@/lib/profile/sync";
import {
ALLOWED_AVATAR_TYPES,
MAX_AVATAR_SIZE,
@@ -57,7 +56,11 @@ export async function POST(request: Request) {
await env.BUCKET.put(key, await file.arrayBuffer(), {
httpMetadata: { contentType: file.type },
});
- await getDb(env).update(users).set({ avatarKey: key }).where(eq(users.id, user.id));
+ await syncPersonalIdentity(getDb(env), {
+ userId: user.id,
+ name: user.name,
+ avatarKey: key,
+ });
return NextResponse.json({ ok: true });
}
@@ -69,7 +72,11 @@ export async function DELETE(request: Request) {
if (user.avatarKey) {
await env.BUCKET.delete(user.avatarKey);
- await getDb(env).update(users).set({ avatarKey: null }).where(eq(users.id, user.id));
}
+ await syncPersonalIdentity(getDb(env), {
+ userId: user.id,
+ name: user.name,
+ avatarKey: null,
+ });
return NextResponse.json({ ok: true });
}
diff --git a/src/app/api/settings/profile/route.ts b/src/app/api/settings/profile/route.ts
index 75b66d4..0e7350f 100644
--- a/src/app/api/settings/profile/route.ts
+++ b/src/app/api/settings/profile/route.ts
@@ -1,11 +1,12 @@
import { NextResponse } from "next/server";
-import { and, eq } from "drizzle-orm";
+import { eq } from "drizzle-orm";
import { ZodError } from "zod";
import { getEnv } from "@/lib/cloudflare";
import { getDb } from "@/db";
-import { mailboxes, users } from "@/db/schema";
+import { users } from "@/db/schema";
import { requireUser } from "@/lib/auth/cookies";
import { getLicenseEntitlements } from "@/lib/licenses/service";
+import { syncPersonalIdentity } from "@/lib/profile/sync";
import type { UpdateProfileInput } from "./types";
import { parseUpdateProfileRequest } from "./utils";
@@ -28,18 +29,15 @@ export async function PATCH(request: Request) {
return NextResponse.json({ error: "A Pro or Team license is required for email forwarding" }, { status: 403 });
}
const forwardingEmail = parsed.forwardingEmail === undefined ? user.forwardingEmail : parsed.forwardingEmail;
+ await syncPersonalIdentity(db, {
+ userId: user.id,
+ name: parsed.name,
+ avatarKey: user.avatarKey,
+ });
await db
.update(users)
- .set({
- name: parsed.name,
- resetEmail: parsed.resetEmail,
- forwardingEmail,
- })
+ .set({ resetEmail: parsed.resetEmail, forwardingEmail })
.where(eq(users.id, user.id));
- await db
- .update(mailboxes)
- .set({ displayName: parsed.name })
- .where(and(eq(mailboxes.userId, user.id), eq(mailboxes.type, "personal")));
return NextResponse.json({
user: {
diff --git a/src/components/contacts/contact-avatar-form.tsx b/src/components/contacts/contact-avatar-form.tsx
index 1b9836e..e6f9b76 100644
--- a/src/components/contacts/contact-avatar-form.tsx
+++ b/src/components/contacts/contact-avatar-form.tsx
@@ -86,7 +86,7 @@ export function ContactAvatarForm({
</button>
<div>
<p className="text-sm font-medium text-neutral-900">Profile picture</p>
- <p className="text-xs text-neutral-500">Upload a contact photo to override Gravatar.</p>
+ <p className="text-xs text-neutral-500">Upload a custom contact photo.</p>
{hasAvatar && (
<button type="button" onClick={() => void onRemove()} disabled={busy} className="mt-1 text-xs font-medium text-blue-600 hover:underline disabled:text-neutral-400">
Remove photo
diff --git a/src/components/contacts/contact-avatar-types.d.ts b/src/components/contacts/contact-avatar-types.d.ts
index d0fad7a..91cca4c 100644
--- a/src/components/contacts/contact-avatar-types.d.ts
+++ b/src/components/contacts/contact-avatar-types.d.ts
@@ -3,5 +3,6 @@ export type ContactAvatarProps = {
address: string;
name: string;
hasManagedAvatar?: boolean;
+ managedAvatarUrl?: string;
className?: string;
};
diff --git a/src/components/contacts/contact-avatar-utils.ts b/src/components/contacts/contact-avatar-utils.ts
index bf0d3d7..f5e6125 100644
--- a/src/components/contacts/contact-avatar-utils.ts
+++ b/src/components/contacts/contact-avatar-utils.ts
@@ -6,13 +6,6 @@ export function getManagedContactAvatarUrl(mailboxId: string, address: string, v
return `/api/contacts/avatar?${params.toString()}`;
}
-export async function getGravatarAvatarUrl(address: string): Promise<string> {
- const email = getEmailAddress(address).trim().toLowerCase();
- const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(email));
- const hash = Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, "0")).join("");
- return `https://gravatar.com/avatar/${hash}?d=404&r=g&s=96`;
-}
-
export function getContactAvatarInitial(name: string, address: string): string {
return (name.trim() || getEmailAddress(address)).slice(0, 1).toUpperCase();
}
diff --git a/src/components/contacts/contact-avatar.tsx b/src/components/contacts/contact-avatar.tsx
index b2363ae..b906ba9 100644
--- a/src/components/contacts/contact-avatar.tsx
+++ b/src/components/contacts/contact-avatar.tsx
@@ -7,7 +7,6 @@ import { cn } from "@/lib/utils";
import type { ContactAvatarProps } from "./contact-avatar-types";
import {
getContactAvatarInitial,
- getGravatarAvatarUrl,
getManagedContactAvatarUrl,
} from "./contact-avatar-utils";
@@ -16,6 +15,7 @@ export function ContactAvatar({
address,
name,
hasManagedAvatar = false,
+ managedAvatarUrl,
className,
}: ContactAvatarProps) {
const [managedAvatar, setManagedAvatar] = useState(hasManagedAvatar);
@@ -28,7 +28,7 @@ export function ContactAvatar({
setAvatarUrl(null);
setImageFailed(false);
setAvatarVersion(0);
- }, [address, hasManagedAvatar, mailboxId]);
+ }, [address, hasManagedAvatar, mailboxId, managedAvatarUrl]);
useEffect(() => {
function onAvatarChanged(event: Event) {
@@ -44,19 +44,17 @@ export function ContactAvatar({
}, [address]);
useEffect(() => {
- let cancelled = false;
setImageFailed(false);
+ if (managedAvatarUrl) {
+ setAvatarUrl(managedAvatarUrl);
+ return;
+ }
if (managedAvatar && mailboxId) {
setAvatarUrl(getManagedContactAvatarUrl(mailboxId, address, avatarVersion));
return;
}
- void getGravatarAvatarUrl(address).then((url) => {
- if (!cancelled) setAvatarUrl(url);
- });
- return () => {
- cancelled = true;
- };
- }, [address, avatarVersion, mailboxId, managedAvatar]);
+ setAvatarUrl(null);
+ }, [address, avatarVersion, mailboxId, managedAvatar, managedAvatarUrl]);
if (avatarUrl && !imageFailed) {
return (
@@ -66,7 +64,8 @@ export function ContactAvatar({
alt=""
className={cn("h-8 w-8 shrink-0 rounded-full border border-neutral-200 object-cover", className)}
onError={() => {
- if (managedAvatar) setManagedAvatar(false);
+ if (managedAvatarUrl) setImageFailed(true);
+ else if (managedAvatar) setManagedAvatar(false);
else setImageFailed(true);
}}
/>
diff --git a/src/components/contacts/contact-details.tsx b/src/components/contacts/contact-details.tsx
index 5c31ffa..aa06c0d 100644
--- a/src/components/contacts/contact-details.tsx
+++ b/src/components/contacts/contact-details.tsx
@@ -97,7 +97,7 @@ export function ContactDetailsTrigger({
<DialogDescription>Update how this contact appears in your mailbox.</DialogDescription>
</DialogHeader>
<div className="space-y-5">
- <div className="flex items-center gap-4">
+ <div className="flex flex-col items-start gap-4">
<ContactAvatarForm
mailboxId={mailboxId}
address={address}
@@ -105,10 +105,6 @@ export function ContactDetailsTrigger({
hasAvatar={contact?.hasAvatar ?? false}
onAvatarChange={(hasAvatar) => setContact((current) => current ? { ...current, hasAvatar } : current)}
/>
- <div className="min-w-0">
- <p className="truncate font-medium text-neutral-900">{shownName}</p>
- <p className="truncate text-sm text-neutral-500">{contact?.email ?? address}</p>
- </div>
</div>
<div className="space-y-2">
<Label htmlFor="contact-display-name">Name</Label>
@@ -119,6 +115,14 @@ export function ContactDetailsTrigger({
disabled={loading || saving}
/>
</div>
+ <div className="space-y-2">
+ <Label htmlFor="contact-email">Email</Label>
+ <Input
+ id="contact-email"
+ value={contact?.email ?? address}
+ disabled
+ />
+ </div>
<div className="grid gap-3 rounded-lg bg-neutral-50 p-3 text-sm sm:grid-cols-2">
<div>
<p className="text-xs font-medium uppercase text-neutral-400">Source</p>
diff --git a/src/components/mailbox-provider.tsx b/src/components/mailbox-provider.tsx
index cea5f23..91b4c15 100644
--- a/src/components/mailbox-provider.tsx
+++ b/src/components/mailbox-provider.tsx
@@ -18,6 +18,7 @@ import {
getClientSessionToken,
} from "@/lib/auth/client";
import { PROFILE_NAME_CHANGED_EVENT } from "@/lib/profile/name-client";
+import { PROFILE_AVATAR_CHANGED_EVENT } from "@/lib/profile/avatar-client";
import type { ProfileNameChangedDetail } from "@/lib/profile/types";
export type MailboxOption = {
@@ -118,6 +119,21 @@ export function MailboxProvider({ children }: { children: ReactNode }) {
return () => window.removeEventListener(PROFILE_NAME_CHANGED_EVENT, updatePersonalMailboxNames);
}, []);
+ useEffect(() => {
+ function updatePersonalMailboxAvatars() {
+ clearMailboxesCache();
+ setMailboxes((items) => items.map((mailbox) => (
+ mailbox.type === "personal" ? { ...mailbox, hasAvatar: true } : mailbox
+ )));
+ setSelectedMailboxState((mailbox) => (
+ mailbox?.type === "personal" ? { ...mailbox, hasAvatar: true } : mailbox
+ ));
+ }
+
+ window.addEventListener(PROFILE_AVATAR_CHANGED_EVENT, updatePersonalMailboxAvatars);
+ return () => window.removeEventListener(PROFILE_AVATAR_CHANGED_EVENT, updatePersonalMailboxAvatars);
+ }, []);
+
const setSelectedMailbox = useCallback((mb: MailboxOption | null) => {
setSelectedMailboxState((current) => (current?.id === mb?.id ? current : mb));
if (mb) {
diff --git a/src/components/mailbox-selector.tsx b/src/components/mailbox-selector.tsx
index 4c5755d..93672f9 100644
--- a/src/components/mailbox-selector.tsx
+++ b/src/components/mailbox-selector.tsx
@@ -142,11 +142,21 @@ export function MailboxSelector() {
const detail = (event as CustomEvent<ProfileAvatarChangedDetail>).detail;
setAvatarUrl(detail?.url ?? getProfileAvatarUrl());
setHasAvatar(true);
+ setMailboxAvatarUrls((current) => {
+ const next = { ...current };
+ const version = Date.now();
+ for (const mailbox of mailboxes) {
+ if (mailbox.type === "personal") {
+ next[mailbox.id] = `/api/mailboxes/${mailbox.id}/avatar?v=${version}`;
+ }
+ }
+ return next;
+ });
}
window.addEventListener(PROFILE_AVATAR_CHANGED_EVENT, onAvatarChanged);
return () => window.removeEventListener(PROFILE_AVATAR_CHANGED_EVENT, onAvatarChanged);
- }, []);
+ }, [mailboxes]);
useEffect(() => {
function onNameChanged(event: Event) {
diff --git a/src/components/messages/conversation-thread.tsx b/src/components/messages/conversation-thread.tsx
index 8b2e21c..f102503 100644
--- a/src/components/messages/conversation-thread.tsx
+++ b/src/components/messages/conversation-thread.tsx
@@ -151,6 +151,7 @@ export function ConversationMessageCard({
address={message.fromAddr}
name={sender}
hasManagedAvatar={message.fromContactHasAvatar}
+ managedAvatarUrl={outbound && mailboxId ? `/api/mailboxes/${mailboxId}/avatar` : undefined}
/>
<span className="min-w-0 flex-1">
<div className="flex flex-col">
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index ba4ab05..2af0309 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -19,7 +19,7 @@ export function DialogContent({
<DialogPrimitive.Overlay className="dialog-overlay fixed inset-0 z-50 bg-black/35" />
<DialogPrimitive.Content
className={cn(
- "dialog-content fixed left-1/2 top-1/2 z-50 w-[min(520px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 rounded-xl border border-neutral-200 bg-white p-6 shadow-xl",
+ "dialog-content fixed left-1/2 top-1/2 z-50 w-[min(520px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 rounded-2xl bg-white p-6 shadow-xl",
className,
)}
{...props}
diff --git a/src/lib/contacts/avatar.ts b/src/lib/contacts/avatar.ts
new file mode 100644
index 0000000..1436585
--- /dev/null
+++ b/src/lib/contacts/avatar.ts
@@ -0,0 +1,3 @@
+export function contactAvatarKeyFor(userId: string, email: string): string {
+ return `contact-avatars/${userId}/${encodeURIComponent(email.trim().toLowerCase())}`;
+}
diff --git a/src/lib/contacts/gravatar.ts b/src/lib/contacts/gravatar.ts
new file mode 100644
index 0000000..cf6b6c1
--- /dev/null
+++ b/src/lib/contacts/gravatar.ts
@@ -0,0 +1,45 @@
+import { contactAvatarKeyFor } from "./avatar";
+
+const MAX_GRAVATAR_SIZE = 2 * 1024 * 1024;
+const ALLOWED_GRAVATAR_TYPES = new Set([
+ "image/gif",
+ "image/jpeg",
+ "image/png",
+ "image/webp",
+]);
+
+export async function importGravatarAvatar(
+ env: CloudflareEnv,
+ userId: string,
+ email: string,
+): Promise<string | null> {
+ try {
+ const normalizedEmail = email.trim().toLowerCase();
+ const digest = await crypto.subtle.digest(
+ "SHA-256",
+ new TextEncoder().encode(normalizedEmail),
+ );
+ const hash = Array.from(
+ new Uint8Array(digest),
+ (byte) => byte.toString(16).padStart(2, "0"),
+ ).join("");
+ const response = await fetch(
+ `https://gravatar.com/avatar/${hash}?d=404&r=g&s=256`,
+ );
+ if (!response.ok) return null;
+
+ const contentType = response.headers.get("Content-Type")?.split(";", 1)[0]?.trim().toLowerCase();
+ const declaredSize = Number(response.headers.get("Content-Length") ?? 0);
+ if (!contentType || !ALLOWED_GRAVATAR_TYPES.has(contentType)) return null;
+ if (declaredSize > MAX_GRAVATAR_SIZE) return null;
+
+ const image = await response.arrayBuffer();
+ if (image.byteLength > MAX_GRAVATAR_SIZE) return null;
+
+ const key = contactAvatarKeyFor(userId, normalizedEmail);
+ await env.BUCKET.put(key, image, { httpMetadata: { contentType } });
+ return key;
+ } catch {
+ return null;
+ }
+}
diff --git a/src/lib/contacts/service.ts b/src/lib/contacts/service.ts
index 816a288..e73c795 100644
--- a/src/lib/contacts/service.ts
+++ b/src/lib/contacts/service.ts
@@ -4,6 +4,7 @@ import { contacts, routingRules } from "@/db/schema";
import { getFirstEmailAddressEntry, normalizeEmailAddress } from "@/lib/email/address";
import type { BlockContactInput, ContactInput, MessageContactNames } from "@/lib/contacts/types";
import { getContactId, getContactNameFromAddress } from "@/lib/contacts/utils";
+import { importGravatarAvatar } from "@/lib/contacts/gravatar";
export async function upsertContactFromAddress(env: CloudflareEnv, input: ContactInput) {
const email = normalizeEmailAddress(input.address);
@@ -42,6 +43,10 @@ export async function upsertContactFromAddress(env: CloudflareEnv, input: Contac
source: input.source,
lastSeenAt: now,
});
+ const avatarKey = await importGravatarAvatar(env, input.userId, email);
+ if (avatarKey) {
+ await db.update(contacts).set({ avatarKey }).where(eq(contacts.id, id));
+ }
const [created] = await db.select().from(contacts).where(eq(contacts.id, id)).limit(1);
return created ?? null;
@@ -116,6 +121,10 @@ export async function blockContact(env: CloudflareEnv, input: BlockContactInput)
blocked: true,
lastSeenAt: new Date(),
});
+ const avatarKey = await importGravatarAvatar(env, input.userId, email);
+ if (avatarKey) {
+ await db.update(contacts).set({ avatarKey }).where(eq(contacts.id, contactId));
+ }
}
const [existingRule] = await db
diff --git a/src/lib/email/sender.ts b/src/lib/email/sender.ts
index c6cb00d..3059da2 100644
--- a/src/lib/email/sender.ts
+++ b/src/lib/email/sender.ts
@@ -20,6 +20,8 @@ export async function getAuthorizedSenderAddress(
.select({
localPart: mailboxes.localPart,
displayName: mailboxes.displayName,
+ type: mailboxes.type,
+ ownerName: users.name,
hostname: domains.hostname,
domainId: mailboxes.domainId,
useAllDomains: mailboxes.useAllDomains,
@@ -27,6 +29,7 @@ export async function getAuthorizedSenderAddress(
})
.from(mailboxes)
.innerJoin(domains, eq(mailboxes.domainId, domains.id))
+ .innerJoin(users, eq(mailboxes.userId, users.id))
.where(eq(mailboxes.id, input.mailboxId))
.limit(1);
@@ -45,15 +48,16 @@ export async function getAuthorizedSenderAddress(
throw new Error("Sender address does not match the selected mailbox");
}
const senderAddress = requestedAddress.toLowerCase();
+ const senderName = mailbox.type === "personal" ? mailbox.ownerName : mailbox.displayName;
if (access.canSendAs) {
return {
- fromAddr: formatEmailAddress(senderAddress, mailbox.displayName),
+ fromAddr: formatEmailAddress(senderAddress, senderName),
mailboxId: mailbox.id,
};
}
- const mailboxName = mailbox.displayName || senderAddress;
+ const mailboxName = senderName || senderAddress;
return {
fromAddr: formatEmailAddress(senderAddress, `${actor.name} on behalf of ${mailboxName}`),
mailboxId: mailbox.id,
diff --git a/src/lib/profile/sync-types.d.ts b/src/lib/profile/sync-types.d.ts
new file mode 100644
index 0000000..9013b38
--- /dev/null
+++ b/src/lib/profile/sync-types.d.ts
@@ -0,0 +1,5 @@
+export type PersonalIdentity = {
+ userId: string;
+ name: string;
+ avatarKey: string | null;
+};
diff --git a/src/lib/profile/sync.ts b/src/lib/profile/sync.ts
new file mode 100644
index 0000000..2c48d90
--- /dev/null
+++ b/src/lib/profile/sync.ts
@@ -0,0 +1,75 @@
+import { and, eq } from "drizzle-orm";
+import type { AppDatabase } from "@/db";
+import { contacts, mailboxes, users } from "@/db/schema";
+import { getContactId } from "@/lib/contacts/utils";
+import { getMailboxDomainAddresses } from "@/lib/mailboxes/domain-addresses";
+import type { PersonalIdentity } from "./sync-types";
+
+export async function syncPersonalIdentity(
+ db: AppDatabase,
+ identity: PersonalIdentity,
+): Promise<void> {
+ await db
+ .update(users)
+ .set({ name: identity.name, avatarKey: identity.avatarKey })
+ .where(eq(users.id, identity.userId));
+
+ await db
+ .update(mailboxes)
+ .set({ displayName: identity.name, avatarKey: identity.avatarKey })
+ .where(and(eq(mailboxes.userId, identity.userId), eq(mailboxes.type, "personal")));
+
+ const personalMailboxes = await db
+ .select()
+ .from(mailboxes)
+ .where(and(eq(mailboxes.userId, identity.userId), eq(mailboxes.type, "personal")));
+ const addresses = new Set(
+ (await Promise.all(
+ personalMailboxes.map((mailbox) => getMailboxDomainAddresses(db, mailbox)),
+ )).flat(),
+ );
+
+ for (const email of addresses) {
+ await db
+ .insert(contacts)
+ .values({
+ id: getContactId(identity.userId, email),
+ userId: identity.userId,
+ email,
+ displayName: identity.name,
+ avatarKey: identity.avatarKey,
+ source: "manual",
+ })
+ .onConflictDoUpdate({
+ target: [contacts.userId, contacts.email],
+ set: {
+ displayName: identity.name,
+ avatarKey: identity.avatarKey,
+ source: "manual",
+ },
+ });
+ }
+}
+
+export async function getPersonalIdentityForAddress(
+ db: AppDatabase,
+ userId: string,
+ email: string,
+) {
+ const [account] = await db
+ .select({ userId: users.id, name: users.name, avatarKey: users.avatarKey })
+ .from(users)
+ .where(eq(users.id, userId))
+ .limit(1);
+ if (!account) return null;
+
+ const personalMailboxes = await db
+ .select()
+ .from(mailboxes)
+ .where(and(eq(mailboxes.userId, userId), eq(mailboxes.type, "personal")));
+ for (const mailbox of personalMailboxes) {
+ const addresses = await getMailboxDomainAddresses(db, mailbox);
+ if (addresses.includes(email)) return account;
+ }
+ return null;
+}