From 1f73b9744a55c9464ed15860d5b6d29f30cf281d Mon Sep 17 00:00:00 2001 From: FragginWagon Date: Fri, 30 Jan 2026 05:26:34 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Update=20Discord=20OAuth=20to=20?= =?UTF-8?q?prioritize=20DISCORD=5FREDIRECT=5FURI=20over=20VITE=5FDISCORD?= =?UTF-8?q?=5FREDIRECT=5FURI=20and=20adjust=20error=20messages=20according?= =?UTF-8?q?ly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/websites/pokedex.online/server/oauth-proxy.js | 4 ++-- code/websites/pokedex.online/server/routes/auth.js | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/websites/pokedex.online/server/oauth-proxy.js b/code/websites/pokedex.online/server/oauth-proxy.js index f24f804..1a7869e 100644 --- a/code/websites/pokedex.online/server/oauth-proxy.js +++ b/code/websites/pokedex.online/server/oauth-proxy.js @@ -74,7 +74,7 @@ app.post('/oauth/token', async (req, res) => { if (provider === 'discord') { const clientId = process.env.VITE_DISCORD_CLIENT_ID; const clientSecret = process.env.DISCORD_CLIENT_SECRET; - const redirectUri = process.env.VITE_DISCORD_REDIRECT_URI; + const redirectUri = process.env.DISCORD_REDIRECT_URI || process.env.VITE_DISCORD_REDIRECT_URI; if (!clientId || !clientSecret || !redirectUri) { logger.warn('Discord OAuth not configured', { @@ -85,7 +85,7 @@ app.post('/oauth/token', async (req, res) => { return res.status(503).json({ error: 'Discord OAuth not configured', message: - 'Set VITE_DISCORD_CLIENT_ID, DISCORD_CLIENT_SECRET, and VITE_DISCORD_REDIRECT_URI environment variables' + 'Set VITE_DISCORD_CLIENT_ID, DISCORD_CLIENT_SECRET, and DISCORD_REDIRECT_URI environment variables' }); } diff --git a/code/websites/pokedex.online/server/routes/auth.js b/code/websites/pokedex.online/server/routes/auth.js index a0e1e89..59b59b6 100644 --- a/code/websites/pokedex.online/server/routes/auth.js +++ b/code/websites/pokedex.online/server/routes/auth.js @@ -203,9 +203,7 @@ export function createAuthRouter({ secret, adminPassword } = {}) { if (provider === 'discord') { const clientId = process.env.VITE_DISCORD_CLIENT_ID; const clientSecret = process.env.DISCORD_CLIENT_SECRET; - const redirectUri = process.env.VITE_DISCORD_REDIRECT_URI; - - if (!clientId || !clientSecret) { + const redirectUri = process.env.DISCORD_REDIRECT_URI || process.env.VITE_DISCORD_REDIRECT_URI; console.error('Discord OAuth not configured:', { hasClientId: !!clientId, hasClientSecret: !!clientSecret