Two cleanups in one pass: 1. Update import paths app-wide from `~/lib/auth.server` to `~/lib/auth/session.server` for the four session helpers (sessionStorage, createSession, getSessionUser, destroySession). ~40 files: 33 simple path swaps where the file imported only session symbols, 5 splits where it also imported per-method auth functions (auth.verify.tsx, api.settings.email.ts, activities.\$id.tsx, routes.\$id.tsx, auth.accept-terms.tsx) — those keep one import from auth.server (for verifyMagicToken, canView, recordTermsAcceptance, etc.) and gain a second import from auth/session.server. Two more files used relative paths and were missed by the first grep pass (lib/oauth.server.ts and routes/oauth.authorize.tsx) — migrated too. The @deprecated re-exports block in auth.server.ts is gone. 2. Rename the new auth files to follow the project's `.server.ts` convention so Vite/React Router treat them as server-only (they read process.env.SESSION_SECRET, hit the DB, etc. — must NOT enter the client bundle): - auth/session.ts → auth/session.server.ts - auth/completion.ts → auth/completion.server.ts - auth/completion.test.ts → auth/completion.server.test.ts Done with `git mv` so blame is preserved. Verified: typecheck + lint green; 126 unit tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
30 lines
1.1 KiB
TypeScript
30 lines
1.1 KiB
TypeScript
import { data, redirect } from "react-router";
|
|
import { eq } from "drizzle-orm";
|
|
import type { Route } from "./+types/api.settings.profile";
|
|
import { getSessionUser } from "~/lib/auth/session.server";
|
|
import { getDb } from "~/lib/db";
|
|
import { users } from "@trails-cool/db/schema/journal";
|
|
|
|
export async function action({ request }: Route.ActionArgs) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) throw redirect("/auth/login");
|
|
|
|
const formData = await request.formData();
|
|
const displayName = (formData.get("displayName") as string)?.trim() || null;
|
|
const bio = (formData.get("bio") as string)?.trim().slice(0, 160) || null;
|
|
const rawVisibility = formData.get("profileVisibility") as string | null;
|
|
const profileVisibility: "public" | "private" | undefined =
|
|
rawVisibility === "public" || rawVisibility === "private" ? rawVisibility : undefined;
|
|
|
|
const db = getDb();
|
|
await db
|
|
.update(users)
|
|
.set({
|
|
displayName,
|
|
bio,
|
|
...(profileVisibility ? { profileVisibility } : {}),
|
|
})
|
|
.where(eq(users.id, user.id));
|
|
|
|
return data({ ok: true });
|
|
}
|