ilia
df865dca41
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
52 lines
1.4 KiB
Bash
Executable File
52 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
# Merge main into dev to resolve conflicts before merging dev into main
|
|
|
|
set -e
|
|
|
|
echo "========================================="
|
|
echo "Merging main into dev to resolve conflicts"
|
|
echo "========================================="
|
|
|
|
cd /home/beast/Code/mirrormatch
|
|
|
|
# 1. Make sure we're on dev
|
|
echo ""
|
|
echo "Step 1: Checking out dev branch..."
|
|
git checkout dev
|
|
git pull gitea dev
|
|
|
|
# 2. Fetch latest main
|
|
echo ""
|
|
echo "Step 2: Fetching latest main..."
|
|
git fetch gitea main
|
|
|
|
# 3. Try to merge main into dev
|
|
echo ""
|
|
echo "Step 3: Merging main into dev..."
|
|
echo "This may show conflicts that need to be resolved manually."
|
|
echo ""
|
|
|
|
if git merge gitea/main --no-commit; then
|
|
echo "✓ No conflicts! Merging..."
|
|
git commit -m "Merge main into dev: resolve conflicts before MR"
|
|
echo ""
|
|
echo "✓ Merge complete! Now push dev:"
|
|
echo " git push gitea dev"
|
|
echo ""
|
|
echo "Then your MR from dev → main should work without conflicts."
|
|
else
|
|
echo ""
|
|
echo "⚠ Conflicts detected! You need to resolve them manually:"
|
|
echo ""
|
|
echo "Conflicting files:"
|
|
git diff --name-only --diff-filter=U
|
|
echo ""
|
|
echo "To resolve:"
|
|
echo " 1. Edit the conflicting files"
|
|
echo " 2. git add <resolved-files>"
|
|
echo " 3. git commit -m 'Merge main into dev: resolve conflicts'"
|
|
echo " 4. git push gitea dev"
|
|
echo ""
|
|
echo "Then your MR from dev → main should work."
|
|
fi
|