mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-17 07:42:23 +00:00
fix(i18n): survive Safari's 7-day cookie cap on the chosen locale
The first-paint ladder consulted only the healthlog-locale cookie and Accept-Language — never User.locale. The cookie is written client-side via document.cookie, which Safari ITP caps at 7 days, so a chosen language silently reverted to the browser language once a week. Three seams close it: - resolveInitialLocale (extracted to src/lib/i18n/resolve-initial-locale.ts) now reads User.locale on a cookie miss via a lightweight session read (no sliding-expiry write, no cookie mutation, fail-soft) before the Accept-Language fallback. - PUT /api/auth/me/locale mirrors the accepted locale into the cookie via Set-Cookie (365 days, SameSite=Lax, not HttpOnly, Secure via shouldEmitSecureCookie) — server-set cookies are exempt from the ITP cap, and the mount-time backfill hitting the route doubles as the weekly refresh. - getSession re-emits the cookie when the user has a persisted locale but the cookie is absent (absent-only, so a mid-switch cookie is never reverted before the PUT lands). Users who never chose a language stay on Accept-Language.
This commit is contained in:
1 parent
ef82545870
commit
e9692f0b81
6 files changed
+233
-20
No files matched your search
@@ -5,6 +5,8 @@ import { ensureDbCompatibility } from "@/lib/db-compat";
|
||||
import { getEvent } from "@/lib/logging/context";
|
||||
import { shouldEmitSecureCookie } from "@/lib/auth/secure-cookie";
|
||||
import { isP2025 } from "@/lib/prisma-errors";
|
||||
import { locales, type Locale } from "@/lib/i18n/config";
|
||||
import { LOCALE_COOKIE, setLocaleCookie } from "@/lib/i18n/locale-cookie";
|
||||
|
||||
const SESSION_COOKIE = "healthlog_session";
|
||||
const SESSION_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000; // 30 days
|
||||
@@ -170,12 +172,56 @@ export async function getSession(): Promise<{
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
// Locale-cookie refresh: Safari's ITP expires the script-written
|
||||
// `healthlog-locale` cookie after 7 days, so a returning user's first
|
||||
// paint fell back to the browser language once a week. When the user
|
||||
// has a persisted locale but the cookie is gone, re-emit it here —
|
||||
// Set-Cookie is exempt from the ITP cap. Absent-only on purpose: a
|
||||
// locale switch writes the cookie client-side before the PUT persists
|
||||
// the column, and overwriting a *differing* cookie here would revert
|
||||
// that fresh choice mid-flight. Fail-soft: in a server-component
|
||||
// render the cookie store is read-only and `set` throws — the next
|
||||
// route-handler request re-attempts.
|
||||
if (
|
||||
session.user.locale &&
|
||||
(locales as readonly string[]).includes(session.user.locale) &&
|
||||
!cookieStore.get(LOCALE_COOKIE)
|
||||
) {
|
||||
try {
|
||||
setLocaleCookie(cookieStore, session.user.locale as Locale);
|
||||
} catch {
|
||||
// Read-only cookie context — skip; nothing depends on this write.
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
session: { id: session.id, expiresAt: session.expiresAt },
|
||||
user: session.user,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Lightweight read of the signed-in user's persisted locale for the root
|
||||
* layout's first-paint language resolution. Deliberately NOT
|
||||
* `getSession()`: no db-compat check, no sliding-expiry write, no cookie
|
||||
* mutation — the root layout renders on every request in a context where
|
||||
* the cookie store is read-only, so the full session touch is both dead
|
||||
* weight and a throw hazard there. Returns null for missing/expired
|
||||
* sessions and users without a persisted locale.
|
||||
*/
|
||||
export async function getSessionUserLocale(): Promise<string | null> {
|
||||
const cookieStore = await cookies();
|
||||
const sessionId = cookieStore.get(SESSION_COOKIE)?.value;
|
||||
if (!sessionId) return null;
|
||||
|
||||
const session = await prisma.session.findUnique({
|
||||
where: { id: sessionId },
|
||||
select: { expiresAt: true, user: { select: { locale: true } } },
|
||||
});
|
||||
if (!session || session.expiresAt < new Date()) return null;
|
||||
return session.user.locale;
|
||||
}
|
||||
|
||||
export async function destroySession(): Promise<void> {
|
||||
const cookieStore = await cookies();
|
||||
const sessionId = cookieStore.get(SESSION_COOKIE)?.value;
|
||||
|
||||
Reference in new issue
Block a user