All checks were successful
CI / skip-ci-check (push) Successful in 1m23s
CI / lint-and-type-check (push) Successful in 1m46s
CI / test (push) Successful in 1m51s
CI / build (push) Successful in 1m54s
CI / secret-scanning (push) Successful in 1m24s
CI / dependency-scan (push) Successful in 1m28s
CI / sast-scan (push) Successful in 2m32s
CI / workflow-summary (push) Successful in 1m21s
# Merge Request: Production Deployment Fixes and Enhancements ## Summary This MR includes critical fixes for production deployment, authentication improvements, file upload serving, and monitoring capabilities. All changes have been tested and are ready for production. ## 🐛 Critical Fixes ### 1. Authentication & Session Management - **Fixed TypeScript error in session callback** (`lib/auth.ts`) - Removed `return null` that caused build failures - Session callback now always returns a valid session object - **Fixed login redirect loop** (`app/login/page.tsx`) - Changed from `router.push()` to `window.location.href` for full page reload - Ensures session cookie is available before middleware checks - **Created proper middleware** (`proxy.ts`) - Next.js 16 requires `proxy.ts` instead of `middleware.ts` - Fixed authentication checks in Edge runtime - Explicitly specifies cookie name for `getToken` ### 2. Build & Deployment - **Fixed Prisma initialization** (`lib/prisma.ts`) - Made Prisma client initialization lazy to fix build without DATABASE_URL - Uses Proxy pattern for on-demand initialization - Prevents build failures when DATABASE_URL not set ### 3. File Upload & Serving - **Fixed photo upload serving** (`app/api/uploads/[filename]/route.ts`) - Created dedicated API route to serve uploaded files - Files now served via `/api/uploads/[filename]` instead of static `/uploads/` - Ensures files are accessible regardless of filesystem location - Added file existence verification and proper error handling - **Updated upload routes** to use new API endpoint - `app/api/photos/upload/route.ts` - Updated to use `/api/uploads/` URLs - `app/api/photos/upload-multiple/route.ts` - Updated to use `/api/uploads/` URLs - **Fixed photo display components** - `components/PhotoThumbnail.tsx` - Uses regular `img` tag for uploads - `components/PhotoImage.tsx` - Uses regular `img` tag for uploads - Avoids Next.js Image component issues with dynamically uploaded files ### 4. Middleware & Route Protection - **Updated proxy middleware** (`proxy.ts`) - Added `/uploads` and `/api/uploads` to public routes - Added comprehensive activity logging - Improved error handling and logging ## ✨ New Features ### Activity Logging - **Created activity logging utility** (`lib/activity-log.ts`) - Structured logging for user actions - Tracks: page visits, photo uploads, guess submissions - Includes user info, IP, timestamps, and action details - **Added activity logging to key routes** - `proxy.ts` - Logs all page visits and API calls - `app/api/photos/upload/route.ts` - Logs photo uploads - `app/api/photos/[photoId]/guess/route.ts` - Logs guess submissions ### Monitoring - **Activity monitoring commands** - Watch logs: `sudo journalctl -u app-backend -f | grep -E "\[ACTIVITY\]|\[PHOTO_UPLOAD\]|\[GUESS_SUBMIT\]"` - Filter by user, action type, or time range ## 📝 Documentation Updates - **README.md** - Added deployment notes section - Added file upload details and troubleshooting - Added activity monitoring commands - Added database query examples - Updated troubleshooting section - **ARCHITECTURE.md** - Updated middleware references (proxy.ts instead of middleware.ts) - Added activity logging documentation - Updated photo upload flow with file upload details - Added file serving architecture - Updated guess submission flow - **CLEANUP.md** (new) - Created cleanup checklist for future improvements - Documents debug code and verbose logging - Provides recommendations for optimization ## 🔧 Technical Changes ### Files Modified - `lib/auth.ts` - Fixed session callback return type - `app/login/page.tsx` - Fixed redirect to use full page reload - `proxy.ts` - Created/updated middleware with activity logging - `lib/prisma.ts` - Made initialization lazy - `app/api/photos/upload/route.ts` - Updated file serving, added logging - `app/api/photos/upload-multiple/route.ts` - Updated file serving - `components/PhotoThumbnail.tsx` - Fixed image display - `components/PhotoImage.tsx` - Fixed image display ### Files Created - `app/api/uploads/[filename]/route.ts` - File serving API route - `lib/activity-log.ts` - Activity logging utility - `CLEANUP.md` - Cleanup checklist ## ✅ Testing - [x] Authentication flow tested (login, session persistence) - [x] Photo upload tested (file and URL uploads) - [x] Photo display tested (uploaded files visible to all users) - [x] Guess submission tested - [x] Build tested (no TypeScript errors) - [x] Middleware tested (route protection working) - [x] Activity logging verified ## 🚀 Deployment Notes ### Environment Variables Required - `NODE_ENV=production` - `NEXTAUTH_URL` - Production domain - `NEXTAUTH_SECRET` - Secret key - `AUTH_TRUST_HOST=true` (if using reverse proxy) - `DATABASE_URL` - Production database connection ### Post-Deployment 1. Verify `public/uploads/` directory exists and has write permissions 2. Test photo upload and verify files are accessible 3. Monitor activity logs to ensure logging is working 4. Verify authentication flow works correctly ### Monitoring - Watch activity logs: `sudo journalctl -u app-backend -f | grep -E "\[ACTIVITY\]|\[PHOTO_UPLOAD\]|\[GUESS_SUBMIT\]"` - Check for errors: `sudo journalctl -u app-backend --since "1 hour ago" | grep -i error` ## 🔄 Breaking Changes **None** - All changes are backward compatible. Existing photos with `/uploads/` URLs may need to be updated to `/api/uploads/` if files are not accessible, but the system will continue to work. ## 📋 Migration Notes ### For Existing Photos - Photos uploaded before this change use `/uploads/` URLs - New photos use `/api/uploads/` URLs - Old photos will continue to work if files exist in `public/uploads/` - Consider migrating old photo URLs if needed (optional) ## 🎯 Next Steps (Future) See `CLEANUP.md` for recommended cleanup tasks: - Reduce verbose logging in production - Add log levels (DEBUG, INFO, WARN, ERROR) - Protect debug endpoints - Optimize activity logging --- **Ready for Production:** ✅ Yes **Breaking Changes:** ❌ No **Requires Migration:** ⚠️ Optional (old photo URLs) Reviewed-on: #3
161 lines
4.5 KiB
TypeScript
161 lines
4.5 KiB
TypeScript
import { NextRequest, NextResponse } from "next/server"
|
|
import { auth } from "@/lib/auth"
|
|
import { prisma } from "@/lib/prisma"
|
|
import { normalizeString } from "@/lib/utils"
|
|
import { logActivity } from "@/lib/activity-log"
|
|
|
|
export async function POST(
|
|
req: NextRequest,
|
|
{ params }: { params: Promise<{ photoId: string }> }
|
|
) {
|
|
try {
|
|
const session = await auth()
|
|
|
|
if (!session) {
|
|
return NextResponse.json({ error: "Unauthorized" }, { status: 401 })
|
|
}
|
|
|
|
const { photoId } = await params
|
|
const { guessText } = await req.json()
|
|
|
|
if (!guessText || !guessText.trim()) {
|
|
return NextResponse.json(
|
|
{ error: "Guess text is required" },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const photo = await prisma.photo.findUnique({
|
|
where: { id: photoId },
|
|
})
|
|
|
|
if (!photo) {
|
|
return NextResponse.json({ error: "Photo not found" }, { status: 404 })
|
|
}
|
|
|
|
// Prevent users from guessing their own photos
|
|
if (photo.uploaderId === session.user.id) {
|
|
return NextResponse.json(
|
|
{ error: "You cannot guess on your own photos" },
|
|
{ status: 403 }
|
|
)
|
|
}
|
|
|
|
// Check if user already has a correct guess
|
|
const existingCorrectGuess = await prisma.guess.findFirst({
|
|
where: {
|
|
userId: session.user.id,
|
|
photoId: photoId,
|
|
correct: true,
|
|
},
|
|
})
|
|
|
|
if (existingCorrectGuess) {
|
|
return NextResponse.json(
|
|
{ error: "You already guessed this correctly" },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
// Check max attempts limit
|
|
const photoWithMaxAttempts = photo as typeof photo & { maxAttempts: number | null }
|
|
if (photoWithMaxAttempts.maxAttempts !== null && photoWithMaxAttempts.maxAttempts > 0) {
|
|
const userGuessCount = await prisma.guess.count({
|
|
where: {
|
|
userId: session.user.id,
|
|
photoId: photoId,
|
|
},
|
|
})
|
|
|
|
if (userGuessCount >= photoWithMaxAttempts.maxAttempts) {
|
|
return NextResponse.json(
|
|
{ error: `You have reached the maximum number of attempts (${photoWithMaxAttempts.maxAttempts}) for this photo` },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
}
|
|
|
|
// Check if guess is correct (case-insensitive, trimmed)
|
|
const normalizedGuess = normalizeString(guessText)
|
|
const normalizedAnswer = normalizeString(photo.answerName)
|
|
const isCorrect = normalizedGuess === normalizedAnswer
|
|
|
|
// Create the guess
|
|
const guess = await prisma.guess.create({
|
|
data: {
|
|
userId: session.user.id,
|
|
photoId: photoId,
|
|
guessText: guessText.trim(),
|
|
correct: isCorrect,
|
|
},
|
|
})
|
|
|
|
// Update user points based on guess result
|
|
let pointsChange = 0
|
|
const photoWithPenalty = photo as typeof photo & { penaltyEnabled: boolean; penaltyPoints: number }
|
|
|
|
if (isCorrect) {
|
|
// Award points for correct answer
|
|
pointsChange = photo.points
|
|
await prisma.user.update({
|
|
where: { id: session.user.id },
|
|
data: {
|
|
points: {
|
|
increment: photo.points, // Award points based on photo difficulty
|
|
},
|
|
},
|
|
})
|
|
} else if (photoWithPenalty.penaltyEnabled && photoWithPenalty.penaltyPoints > 0) {
|
|
// Deduct points for wrong answer if penalty is enabled
|
|
// First, get current user points to prevent going below 0
|
|
const currentUser = await prisma.user.findUnique({
|
|
where: { id: session.user.id },
|
|
select: { points: true },
|
|
})
|
|
|
|
if (currentUser) {
|
|
const currentPoints = currentUser.points
|
|
const penaltyAmount = photoWithPenalty.penaltyPoints
|
|
const newPoints = Math.max(0, currentPoints - penaltyAmount)
|
|
const actualDeduction = currentPoints - newPoints
|
|
|
|
pointsChange = -actualDeduction
|
|
|
|
await prisma.user.update({
|
|
where: { id: session.user.id },
|
|
data: {
|
|
points: newPoints,
|
|
},
|
|
})
|
|
}
|
|
}
|
|
|
|
// Log guess activity
|
|
logActivity(
|
|
"GUESS_SUBMIT",
|
|
`/api/photos/${photoId}/guess`,
|
|
"POST",
|
|
session.user,
|
|
{
|
|
photoId,
|
|
guessText: guess.guessText.substring(0, 50), // Truncate for privacy
|
|
correct: isCorrect,
|
|
pointsChange
|
|
},
|
|
req
|
|
)
|
|
|
|
return NextResponse.json({
|
|
guess,
|
|
correct: isCorrect,
|
|
pointsChange
|
|
})
|
|
} catch (error) {
|
|
console.error("Error submitting guess:", error)
|
|
return NextResponse.json(
|
|
{ error: "Internal server error" },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
}
|