trails/apps/journal/app/routes/auth.accept-terms.tsx
Ullrich Schäfer f16e80a2eb
Prompt users with stale terms_version to re-accept
The three pre-legal-disclaimer users (ullrich, pistazie, nelli) have
NULL terms_version, and any future Terms update would leave every
existing user in the same state. Close the loop now that we have
version storage by redirecting any logged-in user whose
users.terms_version doesn't match the currently-published
TERMS_VERSION to a dedicated acceptance page.

Changes:
- auth.server: new recordTermsAcceptance(userId, version) helper that
  writes both terms_accepted_at and terms_version.
- root loader: if the session user has a stale or NULL terms_version,
  throw redirect("/auth/accept-terms?returnTo=<pathname>") unless the
  request is already on an allow-listed path
  (/auth/accept-terms, /auth/logout, /legal/*) so Terms are reachable
  and logout works.
- New route /auth/accept-terms (GET renders the prompt, POST records
  acceptance and bounces to a sanitised returnTo). Same-origin check
  on returnTo to avoid open-redirect abuse. Logout button is provided
  as an escape hatch.
- i18n: new auth.reaccept.* keys for EN and DE.
- Spec: new Requirement + five scenarios (redirect, allow-list,
  successful re-accept, missing consent, returnTo sanitisation).

No action on the three legacy users is required beyond what they'll
experience on their next visit — the gate takes care of it.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-19 08:06:16 +02:00

117 lines
3.8 KiB
TypeScript

import { useState } from "react";
import { Form, data, redirect, useLoaderData, useSearchParams } from "react-router";
import { useTranslation } from "react-i18next";
import type { Route } from "./+types/auth.accept-terms";
import { getSessionUser, recordTermsAcceptance } from "~/lib/auth.server";
import { TERMS_VERSION } from "~/lib/legal";
export function meta() {
return [
{ title: "Updated Terms of Service — trails.cool" },
{ name: "robots", content: "noindex" },
];
}
/**
* Paths we'll bounce back to after a successful acceptance. We only allow
* same-origin absolute paths to avoid being used as an open redirect.
*/
function safeReturnTo(raw: string | null): string {
if (!raw) return "/";
if (!raw.startsWith("/") || raw.startsWith("//")) return "/";
return raw;
}
export async function loader({ request }: Route.LoaderArgs) {
const user = await getSessionUser(request);
if (!user) {
throw redirect("/auth/login");
}
// If the user is already current, bounce them back (e.g. double-submit).
if (user.termsVersion === TERMS_VERSION) {
const returnTo = safeReturnTo(new URL(request.url).searchParams.get("returnTo"));
throw redirect(returnTo);
}
return { previousVersion: user.termsVersion };
}
export async function action({ request }: Route.ActionArgs) {
const user = await getSessionUser(request);
if (!user) {
throw redirect("/auth/login");
}
const form = await request.formData();
const accepted = form.get("termsAccepted") === "on" || form.get("termsAccepted") === "true";
if (!accepted) {
return data({ error: "Terms of Service must be accepted to continue" }, { status: 400 });
}
await recordTermsAcceptance(user.id, TERMS_VERSION);
const returnTo = safeReturnTo(form.get("returnTo")?.toString() ?? null);
throw redirect(returnTo);
}
export default function AcceptTermsPage() {
const { t } = useTranslation("journal");
const { previousVersion } = useLoaderData<typeof loader>();
const [searchParams] = useSearchParams();
const returnTo = searchParams.get("returnTo") ?? "/";
const [accepted, setAccepted] = useState(false);
return (
<div className="mx-auto max-w-md px-4 py-16">
<h1 className="text-2xl font-bold text-gray-900">
{t("auth.reaccept.heading")}
</h1>
<p className="mt-4 text-sm text-gray-700">
{previousVersion
? t("auth.reaccept.bodyUpdated", { from: previousVersion, to: TERMS_VERSION })
: t("auth.reaccept.bodyNew", { version: TERMS_VERSION })}
</p>
<Form method="post" className="mt-8 space-y-4">
<input type="hidden" name="returnTo" value={returnTo} />
<label className="flex items-start gap-2 text-sm text-gray-700">
<input
type="checkbox"
name="termsAccepted"
checked={accepted}
onChange={(e) => setAccepted(e.target.checked)}
className="mt-0.5"
/>
<span>
{t("auth.termsBefore")}
<a
href="/legal/terms"
target="_blank"
rel="noopener noreferrer"
className="text-blue-600 hover:underline"
>
{t("auth.termsLink")}
</a>
{t("auth.termsAfter")}
</span>
</label>
<button
type="submit"
disabled={!accepted}
className="w-full rounded-md bg-blue-600 px-4 py-2 text-white hover:bg-blue-700 disabled:opacity-50"
>
{t("auth.reaccept.submit")}
</button>
</Form>
<Form method="post" action="/auth/logout" className="mt-6 text-center">
<button
type="submit"
className="text-sm text-gray-500 hover:text-gray-700"
>
{t("auth.reaccept.logoutInstead")}
</button>
</Form>
</div>
);
}