Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-23 14:59:36 +02:00
Code Issues Releases Activity

feat: update NGINX configuration for improved proxy handling and enable social account login on GET requests

Browse source
This commit is contained in:
Sean Morley 2025-01-07 09:58:39 -05:00
parent a5aa09ed7b
commit 548702890d
3 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/nginx.conf
View file

@ -17,24 +17,24 @@ http {
} }
server { server {
listen 80; listen 80; # NGINX always listens on port 80 inside the container
server_name localhost; server_name localhost;
location / { location / {
proxy_pass http://server:8000; # Forward to internal Gunicorn server proxy_pass http://server:8000; # Explicitly forward to Django service
proxy_set_header Host $host; # Forward Host header from the request proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; # Forward real IP proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # Forward original IP proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; # Forward the protocol proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; # Forward the Host header
} }
location /static/ { location /static/ {
alias /code/staticfiles/; alias /code/staticfiles/; # Serve static files directly
} }
location /media/ { location /media/ {
alias /code/media/; alias /code/media/; # Serve media files directly
} }
} }
} }

2
backend/server/main/settings.py
View file

@ -186,6 +186,8 @@ FRONTEND_URL = getenv('FRONTEND_URL', 'http://localhost:3000')
# Set login redirect URL to the frontend # Set login redirect URL to the frontend
LOGIN_REDIRECT_URL = FRONTEND_URL LOGIN_REDIRECT_URL = FRONTEND_URL
SOCIALACCOUNT_LOGIN_ON_GET = True
HEADLESS_FRONTEND_URLS = { HEADLESS_FRONTEND_URLS = {
"account_confirm_email": f"{FRONTEND_URL}/user/verify-email/{{key}}", "account_confirm_email": f"{FRONTEND_URL}/user/verify-email/{{key}}",
"account_reset_password": f"{FRONTEND_URL}/user/reset-password", "account_reset_password": f"{FRONTEND_URL}/user/reset-password",

25
frontend/src/routes/_allauth/[...path]/+server.ts
View file

@ -12,23 +12,23 @@ export async function GET(event) {
/** @type {import('./$types').RequestHandler} */ /** @type {import('./$types').RequestHandler} */
export async function POST({ url, params, request, fetch, cookies }) { export async function POST({ url, params, request, fetch, cookies }) {
const searchParam = url.search ? `${url.search}&format=json` : '?format=json'; const searchParam = url.search ? `${url.search}` : '';
return handleRequest(url, params, request, fetch, cookies, searchParam, true); return handleRequest(url, params, request, fetch, cookies, searchParam, false);
} }
export async function PATCH({ url, params, request, fetch, cookies }) { export async function PATCH({ url, params, request, fetch, cookies }) {
const searchParam = url.search ? `${url.search}&format=json` : '?format=json'; const searchParam = url.search ? `${url.search}` : '';
return handleRequest(url, params, request, fetch, cookies, searchParam, true); return handleRequest(url, params, request, fetch, cookies, searchParam, false);
} }
export async function PUT({ url, params, request, fetch, cookies }) { export async function PUT({ url, params, request, fetch, cookies }) {
const searchParam = url.search ? `${url.search}&format=json` : '?format=json'; const searchParam = url.search ? `${url.search}` : '';
return handleRequest(url, params, request, fetch, cookies, searchParam, true); return handleRequest(url, params, request, fetch, cookies, searchParam, false);
} }
export async function DELETE({ url, params, request, fetch, cookies }) { export async function DELETE({ url, params, request, fetch, cookies }) {
const searchParam = url.search ? `${url.search}&format=json` : '?format=json'; const searchParam = url.search ? `${url.search}` : '';
return handleRequest(url, params, request, fetch, cookies, searchParam, true); return handleRequest(url, params, request, fetch, cookies, searchParam, false);
} }
async function handleRequest( async function handleRequest(
@ -53,25 +53,18 @@ async function handleRequest(
const headers = new Headers(request.headers); const headers = new Headers(request.headers);
// Delete existing csrf cookie by setting an expired date
cookies.delete('csrftoken', { path: '/' });
// Generate a new csrf token (using your existing fetchCSRFToken function)
const csrfToken = await fetchCSRFToken(); const csrfToken = await fetchCSRFToken();
if (!csrfToken) { if (!csrfToken) {
return json({ error: 'CSRF token is missing or invalid' }, { status: 400 }); return json({ error: 'CSRF token is missing or invalid' }, { status: 400 });
} }
// Set the new csrf token in both headers and cookies
const cookieHeader = `csrftoken=${csrfToken}; Path=/; HttpOnly; SameSite=Lax`;
try { try {
const response = await fetch(targetUrl, { const response = await fetch(targetUrl, {
method: request.method, method: request.method,
headers: { headers: {
...Object.fromEntries(headers), ...Object.fromEntries(headers),
'X-CSRFToken': csrfToken, 'X-CSRFToken': csrfToken,
Cookie: cookieHeader Cookie: `csrftoken=${csrfToken}`
}, },
body: body:
request.method !== 'GET' && request.method !== 'HEAD' ? await request.text() : undefined, request.method !== 'GET' && request.method !== 'HEAD' ? await request.text() : undefined,