Journal server (Phase 1.4 + 1.5): - Add oauth_clients, oauth_codes, oauth_tokens tables to journal schema - Implement GET /oauth/authorize with PKCE flow and login redirect - Implement POST /oauth/token (authorization_code + refresh_token grants) - Add validateBearerToken() + getAuthenticatedUser() middleware - Seed trails-cool-mobile as trusted OAuth client on server startup - Add GET /.well-known/trails-cool discovery endpoint - Add returnTo support to login page and magic link verify - Add @trails-cool/api workspace dependency to journal Mobile app (Phase 1.5 + 1.6): - Login screen with server URL input and discovery validation - OAuth2 PKCE login via expo-web-browser with expo-crypto for Hermes - Token storage in expo-secure-store with auto-refresh on 401 - API client with bearer token injection and typed errors - Server URL persistence with localhost default in dev mode - API version compatibility check on app foreground - Log out + switch server on Profile tab - iOS ATS exception for local networking Tests: - PKCE crypto verification, OAuthError, token generation - Discovery endpoint response shape - API version semver compatibility - API client error types Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
41 lines
1.4 KiB
TypeScript
41 lines
1.4 KiB
TypeScript
import { redirect, data } from "react-router";
|
|
import type { Route } from "./+types/auth.verify";
|
|
import { verifyMagicToken, verifyEmailChange, createSession, getSessionUser } from "~/lib/auth.server";
|
|
|
|
export async function loader({ request }: Route.LoaderArgs) {
|
|
const url = new URL(request.url);
|
|
const token = url.searchParams.get("token");
|
|
const isEmailChange = url.searchParams.get("email-change") === "1";
|
|
|
|
if (!token) {
|
|
return data({ error: "Missing token" }, { status: 400 });
|
|
}
|
|
|
|
try {
|
|
if (isEmailChange) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) return redirect("/auth/login");
|
|
await verifyEmailChange(token, user.id);
|
|
return redirect("/settings#account");
|
|
}
|
|
|
|
const userId = await verifyMagicToken(token);
|
|
const cookie = await createSession(userId, request);
|
|
const returnTo = url.searchParams.get("returnTo");
|
|
const destination = returnTo?.startsWith("/") ? returnTo : "/?add-passkey=1";
|
|
return redirect(destination, { headers: { "Set-Cookie": cookie } });
|
|
} catch (e) {
|
|
return data({ error: (e as Error).message }, { status: 400 });
|
|
}
|
|
}
|
|
|
|
export default function VerifyPage() {
|
|
return (
|
|
<div className="mx-auto max-w-md px-4 py-16 text-center">
|
|
<p className="text-red-600">Invalid or expired magic link.</p>
|
|
<a href="/auth/login" className="mt-4 inline-block text-blue-600 hover:underline">
|
|
Request a new one
|
|
</a>
|
|
</div>
|
|
);
|
|
}
|