trails/apps/journal/app/routes/settings.connections.tsx
Ullrich Schäfer b9aac2859a
Drop auth.server.ts re-exports + rename to .server.ts convention (task 5.2)
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>
2026-05-08 03:01:30 +02:00

108 lines
3.7 KiB
TypeScript

import { data, redirect, useSearchParams } from "react-router";
import { useTranslation } from "react-i18next";
import { eq } from "drizzle-orm";
import type { Route } from "./+types/settings.connections";
import { getSessionUser } from "~/lib/auth/session.server";
import { getDb } from "~/lib/db";
import { connectedServices } from "@trails-cool/db/schema/journal";
import { getAllManifests } from "~/lib/connected-services";
const KNOWN_ERRORS = ["too_many_tokens", "sync_failed", "generic"] as const;
type KnownError = (typeof KNOWN_ERRORS)[number];
function isKnownError(value: string | null): value is KnownError {
return value !== null && (KNOWN_ERRORS as readonly string[]).includes(value);
}
export function meta() {
return [{ title: "Connected services — Settings — trails.cool" }];
}
export async function loader({ request }: Route.LoaderArgs) {
const user = await getSessionUser(request);
if (!user) throw redirect("/auth/login");
const db = getDb();
const connections = await db
.select({
provider: connectedServices.provider,
providerUserId: connectedServices.providerUserId,
})
.from(connectedServices)
.where(eq(connectedServices.userId, user.id));
const providers = getAllManifests().map((m) => {
const conn = connections.find((c) => c.provider === m.id);
return {
id: m.id,
name: m.displayName,
connected: !!conn,
providerUserId: conn?.providerUserId,
};
});
return data({ providers });
}
export default function ConnectionsSettings({ loaderData }: Route.ComponentProps) {
const { providers } = loaderData;
const { t } = useTranslation(["journal"]);
const [searchParams] = useSearchParams();
const errorParam = searchParams.get("error");
const errorKey: KnownError | null = isKnownError(errorParam) ? errorParam : errorParam ? "generic" : null;
return (
<section>
<h2 className="text-lg font-semibold text-gray-900">{t("settings.services.title")}</h2>
{errorKey && (
<div
role="alert"
className="mt-4 rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-800"
>
{t(`settings.services.errors.${errorKey}`)}
</div>
)}
<div className="mt-4 space-y-3">
{providers.map((p) => (
<div
key={p.id}
className="flex items-center justify-between rounded-md border border-gray-200 px-4 py-3"
>
<div>
<p className="font-medium text-gray-900">{p.name}</p>
{p.connected && p.providerUserId && (
<p className="text-xs text-gray-500">
{t("settings.services.connectedAs", { id: p.providerUserId })}
</p>
)}
</div>
{p.connected ? (
<div className="flex items-center gap-3">
<a
href={`/sync/import/${p.id}`}
className="text-sm text-blue-600 hover:underline"
>
{t("sync.import")}
</a>
<form method="post" action={`/api/sync/disconnect/${p.id}`}>
<button
type="submit"
className="text-sm text-red-600 hover:underline"
>
{t("settings.services.disconnect")}
</button>
</form>
</div>
) : (
<a
href={`/api/sync/connect/${p.id}`}
className="rounded-md bg-blue-600 px-3 py-1.5 text-sm text-white hover:bg-blue-700"
>
{t("settings.services.connect")}
</a>
)}
</div>
))}
</div>
</section>
);
}