All checks were successful
CI / skip-ci-check (push) Successful in 1m25s
CI / lint-and-type-check (push) Successful in 1m50s
CI / test (push) Successful in 1m54s
CI / build (push) Successful in 1m54s
CI / secret-scanning (push) Successful in 1m26s
CI / dependency-scan (push) Successful in 1m31s
CI / sast-scan (push) Successful in 2m34s
CI / workflow-summary (push) Successful in 1m23s
# Fix authentication issues and improve developer experience ## Summary This MR fixes critical authentication issues that prevented login on localhost and improves the developer experience with consolidated rebuild scripts and a working help modal keyboard shortcut. ## Problems Fixed ### 1. Authentication Issues - **UntrustedHost Error**: NextAuth v5 was rejecting localhost requests with "UntrustedHost: Host must be trusted" error - **Cookie Prefix Errors**: Cookies were being set with `__Host-` and `__Secure-` prefixes on HTTP (localhost), causing browser rejection - **MissingCSRF Error**: CSRF token cookies were not being set correctly due to cookie configuration issues ### 2. Help Modal Keyboard Shortcut - **Shift+? not working**: The help modal keyboard shortcut was not detecting the question mark key correctly ### 3. Developer Experience - **Multiple rebuild scripts**: Had several overlapping rebuild scripts that were confusing - **Unused code**: Removed unused `useSecureCookies` variable and misleading comments ## Changes Made ### Authentication Fixes (`lib/auth.ts`) - Set `trustHost: true` to fix UntrustedHost error (required for NextAuth v5) - Added explicit cookie configuration for HTTP (localhost) to prevent prefix errors: - Cookies use `secure: false` for HTTP - Cookie names without prefixes for HTTP - Let Auth.js defaults handle HTTPS (with prefixes and Secure flag) - Removed unused `useSecureCookies` variable - Simplified debug logging ### Help Modal Fix (`components/HelpModal.tsx`) - Fixed keyboard shortcut detection to properly handle Shift+? (Shift+/) - Updated help text to show correct shortcut (Shift+? instead of Ctrl+?) ### Developer Scripts - **Consolidated rebuild scripts**: Merged `CLEAN_REBUILD.sh`, `FIX_AND_RESTART.sh`, and `start-server.sh` into single `rebuild.sh` - **Added REBUILD.md**: Documentation for rebuild process - Removed redundant script files ### Code Cleanup - Removed unused `useSecureCookies` variable from `lib/auth.ts` - Removed misleading comment from `app/api/auth/[...nextauth]/route.ts` - Cleaned up verbose debug logging ## Technical Details ### Cookie Configuration The fix works by explicitly configuring cookies for HTTP environments: - **HTTP (localhost)**: Cookies without prefixes, `secure: false` - **HTTPS (production)**: Let Auth.js defaults handle (prefixes + Secure flag) This prevents NextAuth v5 from auto-detecting HTTPS from proxy headers and incorrectly adding cookie prefixes. ### Keyboard Shortcut The question mark key requires Shift+/ on most keyboards. The fix now properly detects: - `event.shiftKey && event.key === "/"` - `event.key === "?"` (fallback) - `event.code === "Slash" && event.shiftKey` (additional fallback) ## Testing - ✅ Login works on localhost (http://localhost:3000) - ✅ No cookie prefix errors in browser console - ✅ No UntrustedHost errors in server logs - ✅ Help modal opens/closes with Shift+? - ✅ Rebuild script works in both dev and prod modes ## Files Changed ### Modified - `lib/auth.ts` - Authentication configuration fixes - `components/HelpModal.tsx` - Keyboard shortcut fix - `app/api/auth/[...nextauth]/route.ts` - Removed misleading comment ### Added - `rebuild.sh` - Consolidated rebuild script - `REBUILD.md` - Rebuild documentation ## Migration Notes No database migrations or environment variable changes required. The fix works with existing configuration. ## Related Issues Fixes authentication issues preventing local development and testing. Reviewed-on: #5
92 lines
3.3 KiB
TypeScript
92 lines
3.3 KiB
TypeScript
import { auth } from "@/lib/auth"
|
|
import { redirect } from "next/navigation"
|
|
import { prisma } from "@/lib/prisma"
|
|
import Link from "next/link"
|
|
import PhotoThumbnail from "@/components/PhotoThumbnail"
|
|
import DeletePhotoButton from "@/components/DeletePhotoButton"
|
|
import { logger } from "@/lib/logger"
|
|
|
|
// Enable caching for this page
|
|
export const revalidate = 60 // Revalidate every 60 seconds
|
|
|
|
export default async function PhotosPage() {
|
|
// DEBUG level: only logs in development or when LOG_LEVEL=DEBUG
|
|
logger.debug("PhotosPage: Starting, calling auth()")
|
|
const session = await auth()
|
|
|
|
if (!session) {
|
|
logger.debug("PhotosPage: No session, redirecting to login")
|
|
redirect("/login")
|
|
}
|
|
|
|
if (!session.user) {
|
|
// WARN level: session exists but no user is a warning condition
|
|
logger.warn("PhotosPage: Session exists but no user, redirecting to login", {
|
|
hasSession: !!session,
|
|
sessionKeys: session ? Object.keys(session) : [],
|
|
})
|
|
redirect("/login")
|
|
}
|
|
|
|
logger.debug("PhotosPage: Session valid, rendering page", {
|
|
userId: session.user.id,
|
|
userEmail: session.user.email,
|
|
})
|
|
|
|
// Limit to 50 photos per page for performance
|
|
const photos = await prisma.photo.findMany({
|
|
take: 50,
|
|
orderBy: { createdAt: "desc" },
|
|
include: {
|
|
uploader: {
|
|
select: {
|
|
name: true,
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
return (
|
|
<div className="max-w-7xl mx-auto px-4 py-8">
|
|
<h1 className="text-3xl font-bold text-gray-900 mb-6">All Photos</h1>
|
|
|
|
{photos.length === 0 ? (
|
|
<div className="bg-white rounded-lg shadow-md p-8 text-center">
|
|
<p className="text-gray-500">No photos yet. Be the first to upload one!</p>
|
|
</div>
|
|
) : (
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
|
|
{photos.map((photo: { id: string; url: string; answerName: string; points: number; createdAt: Date; uploader: { name: string } }) => (
|
|
<div
|
|
key={photo.id}
|
|
className="bg-white rounded-lg shadow-md overflow-hidden hover:shadow-lg transition relative group"
|
|
>
|
|
<Link href={`/photos/${photo.id}`}>
|
|
<div className="aspect-square bg-gray-200 relative">
|
|
<PhotoThumbnail src={photo.url} alt="Photo" />
|
|
</div>
|
|
<div className="p-4">
|
|
<div className="flex items-center justify-between mb-1">
|
|
<p className="text-sm text-gray-500">Uploaded by {photo.uploader.name}</p>
|
|
<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-purple-100 text-purple-800">
|
|
{photo.points} {photo.points === 1 ? "pt" : "pts"}
|
|
</span>
|
|
</div>
|
|
<p className="text-xs text-gray-400 mt-1">
|
|
{new Date(photo.createdAt).toLocaleDateString()}
|
|
</p>
|
|
</div>
|
|
</Link>
|
|
{session.user.role === "ADMIN" && (
|
|
<div className="absolute top-2 right-2 opacity-0 group-hover:opacity-100 transition-opacity">
|
|
<DeletePhotoButton photoId={photo.id} />
|
|
</div>
|
|
)}
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|