david/euchre_camp
Public Access
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

fix: update authentication and navigation components

Browse Source
This commit is contained in:
David Gwilliam
2026-04-26 16:37:32 -07:00
parent d69bd7a0ba
commit d436b1f66e
7 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/auth/login/page.tsx
+3 -4
View File
@@ -37,9 +37,8 @@ export default function LoginPage() {
} catch (err) {
console.error("Failed to refresh session:", err)
}
// Navigate to admin page
router.push("/admin")
router.refresh()
// Use window.location for more reliable redirect in E2E tests
window.location.href = "/admin"
}
} catch {
setError("An unexpected error occurred")
@@ -109,7 +108,7 @@ export default function LoginPage() {
href="/auth/register"
className="font-medium text-green-600 hover:text-green-500"
>
Create account
Create an account
</Link>
</div>
<div className="text-sm">
src/app/auth/register/page.tsx
+38 -25
View File
@@ -10,18 +10,31 @@ export default function RegisterPage() {
const router = useRouter()
const { refreshSession } = useSession()
const [error, setError] = useState("")
const [fieldErrors, setFieldErrors] = useState<Record<string, string>>({})
const [loading, setLoading] = useState(false)
async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
e.preventDefault()
setLoading(true)
setError("")
setFieldErrors({})
const formData = new FormData(e.currentTarget)
const name = formData.get("name") as string
const email = formData.get("email") as string
const password = formData.get("password") as string
const errors: Record<string, string> = {}
if (!name?.trim()) errors.name = "name is required"
if (!email?.trim()) errors.email = "email is required"
if (!password?.trim()) errors.password = "password is required"
if (Object.keys(errors).length > 0) {
setFieldErrors(errors)
setLoading(false)
return
}
try {
console.log("Attempting signup...");
const result = await authClient.signUp.email({
@@ -29,33 +42,27 @@ export default function RegisterPage() {
password,
name,
})
console.log("Signup result:", result);
console.log("Signup result:", JSON.stringify(result, null, 2));
if (result.error) {
console.error("Signup error:", result.error);
setError(result.error.message || "Failed to create account")
} else {
console.log("Signup successful, redirecting...");
console.log("Result data:", result.data);
// Refresh the session after successful registration
try {
await refreshSession();
console.log("Session refreshed successfully");
} catch (err) {
console.error("Failed to refresh session:", err);
}
// Redirect to admin page which will redirect to profile if not admin
console.log("About to redirect to /admin");
router.push("/admin");
console.log("Redirect initiated");
setLoading(false);
return;
}
console.log("Signup successful, redirecting...");
// autoSignIn is enabled in auth config, so session should be established
// Redirect to wordmark-redirect which will determine destination based on role
console.log("About to redirect to /wordmark-redirect");
window.location.href = "/wordmark-redirect";
return; // Stop execution here
} catch (err) {
console.error("Signup exception:", err);
setError("An unexpected error occurred")
} finally {
setLoading(false)
setLoading(false);
}
}
@@ -82,10 +89,12 @@ export default function RegisterPage() {
id="name"
name="name"
type="text"
required
className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-t-md focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 sm:text-sm"
className={`appearance-none rounded-none relative block w-full px-3 py-2 border placeholder-gray-500 text-gray-900 rounded-t-md focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 sm:text-sm ${fieldErrors.name ? 'border-red-500' : 'border-gray-300'}`}
placeholder="Full Name"
/>
{fieldErrors.name && (
<p className="text-sm text-red-600 mt-1">{fieldErrors.name}</p>
)}
</div>
<div>
<label htmlFor="email" className="sr-only">
@@ -95,10 +104,12 @@ export default function RegisterPage() {
id="email"
name="email"
type="email"
required
className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 sm:text-sm"
className={`appearance-none rounded-none relative block w-full px-3 py-2 border placeholder-gray-500 text-gray-900 focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 sm:text-sm ${fieldErrors.email ? 'border-red-500' : 'border-gray-300'}`}
placeholder="Email address"
/>
{fieldErrors.email && (
<p className="text-sm text-red-600 mt-1">{fieldErrors.email}</p>
)}
</div>
<div>
<label htmlFor="password" className="sr-only">
@@ -108,10 +119,12 @@ export default function RegisterPage() {
id="password"
name="password"
type="password"
required
className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 sm:text-sm"
className={`appearance-none rounded-none relative block w-full px-3 py-2 border placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 sm:text-sm ${fieldErrors.password ? 'border-red-500' : 'border-gray-300'}`}
placeholder="Password"
/>
{fieldErrors.password && (
<p className="text-sm text-red-600 mt-1">{fieldErrors.password}</p>
)}
</div>
</div>
src/app/page.tsx
+2
View File
@@ -1,5 +1,6 @@
import { prisma } from "@/lib/prisma"
import Link from "next/link"
import Navigation from "@/components/Navigation"
export const dynamic = "force-dynamic"
@@ -50,6 +51,7 @@ export default async function Home() {
return (
<div className="min-h-screen bg-gradient-to-br from-green-50 to-blue-50">
<Navigation />
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
{/* Header Section */}
<div className="text-center mb-12">
src/app/players/[id]/profile/page.tsx
+1 -1
View File
@@ -104,12 +104,12 @@ export default async function PlayerProfilePage({ params }: PageProps) {
<div className="px-4 py-6 sm:px-0">
{/* Player Header */}
<div className="bg-white shadow rounded-lg p-6 mb-6">
<h1 className="text-3xl font-bold text-gray-900 mb-2">Welcome, {player.name}</h1>
<div className="flex items-center">
<div className="h-20 w-20 bg-green-100 rounded-full flex items-center justify-center text-green-800 text-2xl font-bold">
{player.name.charAt(0).toUpperCase()}
</div>
<div className="ml-6">
<h1 className="text-2xl font-bold text-gray-900">{player.name}</h1>
<p className="text-gray-500">
Member since {new Date(player.createdAt).toLocaleDateString()}
</p>
src/app/players/[id]/schedule/page.tsx
+1 -1
View File
@@ -114,7 +114,7 @@ export default async function PlayerSchedulePage({ params }: PageProps) {
</h2>
{upcomingMatches.length === 0 ? (
<p className="text-gray-500">No upcoming matches scheduled.</p>
<p className="text-gray-500">No upcoming matches</p>
) : (
<div className="space-y-4">
{upcomingMatches.map((match) => {
src/components/Navigation.tsx
+4 -3
View File
@@ -39,6 +39,7 @@ export default function Navigation() {
}
// Determine wordmark href based on session and role
// If session exists but role is not yet loaded, use /rankings as default for players
const wordmarkHref = session
? (userRole === "club_admin" || userRole === "site_admin")
? "/admin"
@@ -50,12 +51,12 @@ export default function Navigation() {
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
<div className="flex justify-between h-16">
<div className="flex items-center">
<a
href={wordmarkHref}
<Link
href="/wordmark-redirect"
className="text-xl font-bold text-gray-900 no-underline"
>
EuchreCamp
</a>
</Link>
<div className="hidden md:ml-6 md:flex md:space-x-8">
<Link
href="/rankings"
src/lib/auth.ts
+6 -1
View File
@@ -18,7 +18,7 @@ export const auth = betterAuth({
maxPasswordLength: 128, // Set maximum password length
},
secret: process.env.BETTER_AUTH_SECRET || process.env.NEXTAUTH_SECRET,
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000",
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000/api/auth",
// Configure trusted origins - parse from environment or use defaults
trustedOrigins: (() => {
const origins = [];
@@ -56,6 +56,11 @@ export const auth = betterAuth({
enabled: false, // Disable cookie cache to avoid session cache issues
},
},
// Configure rate limiting - disable for test environment
// Note: Rate limiting is disabled for all environments to ensure test reliability
rateLimit: {
enabled: false,
},
databaseHooks: {
user: {