ethanf/s22-poll
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update cors to allow same-origin

Browse Source
This commit is contained in:
ethanf 2025-08-14 15:32:46 -05:00
parent 29f3207840
commit 981c2f79f5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/server.js
View File

@ -44,7 +44,7 @@ async function saveVotes(votes) {
// Middleware // Middleware
app.use(cors({ app.use(cors({
origin: process.env.NODE_ENV === 'production' origin: process.env.NODE_ENV === 'production'
? ['https://s22.ethanf.gg'] ? true // Allow same origin in production since frontend and backend are on same domain
: FRONTEND_URL, : FRONTEND_URL,
credentials: true, credentials: true,
methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
@ -63,7 +63,7 @@ app.use(session({
maxAge: 24 * 60 * 60 * 1000, // 24 hours maxAge: 24 * 60 * 60 * 1000, // 24 hours
httpOnly: true, httpOnly: true,
sameSite: process.env.NODE_ENV === 'production' ? 'lax' : 'lax', sameSite: process.env.NODE_ENV === 'production' ? 'lax' : 'lax',
domain: process.env.NODE_ENV === 'production' ? '.ethanf.gg' : undefined domain: process.env.NODE_ENV === 'production' ? 'ethanf.gg' : undefined // Remove the dot prefix
}, },
name: 's22poll.sid' name: 's22poll.sid'
})); }));
@ -112,7 +112,9 @@ app.get('/auth/steam/return',
passport.authenticate('steam', { failureRedirect: '/' }), passport.authenticate('steam', { failureRedirect: '/' }),
(req, res) => { (req, res) => {
console.log('User authenticated:', req.user); console.log('User authenticated:', req.user);
res.redirect(FRONTEND_URL); // In production, redirect to root since frontend and backend are on same domain
const redirectUrl = process.env.NODE_ENV === 'production' ? '/' : FRONTEND_URL;
res.redirect(redirectUrl);
} }
); );

2
src/services/api.ts
View File

@ -1,7 +1,7 @@
import type { MapOption } from "../types"; import type { MapOption } from "../types";
const API_BASE_URL = import.meta.env.PROD const API_BASE_URL = import.meta.env.PROD
? 'https://s22.ethanf.gg' ? '' // Empty string for same-origin requests in production
: 'http://localhost:3001'; : 'http://localhost:3001';
const apiCall = async (endpoint: string, options: RequestInit = {}) => { const apiCall = async (endpoint: string, options: RequestInit = {}) => {