From 98ba9f31cb625171e22534158dbbf006b335070b Mon Sep 17 00:00:00 2001 From: Burlone <108557545+burlone0@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:38:52 +0100 Subject: [PATCH] real Co-Authored-By: feme12 <96890914+feme12@users.noreply.github.com> --- Website/Data/js/oauthCallback.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Website/Data/js/oauthCallback.js b/Website/Data/js/oauthCallback.js index af80b23..df31b64 100644 --- a/Website/Data/js/oauthCallback.js +++ b/Website/Data/js/oauthCallback.js @@ -1,11 +1,14 @@ const axios = require('axios'); +const log = require("../../../structs/log.js"); const User = require('../../../model/user.js'); module.exports = (DISCORD_API_URL, CLIENT_ID, CLIENT_SECRET, REDIRECT_URI) => async (req, res) => { const code = req.query.code; if (!code) { - throw new Error('No code provided'); + return res.json({ + "error": "Invalid oauth code provided." + }) } try { @@ -37,7 +40,9 @@ module.exports = (DISCORD_API_URL, CLIENT_ID, CLIENT_SECRET, REDIRECT_URI) => as res.redirect(`/register?discordId=${discordId}&username=${username}`); } } catch (err) { - console.error('Error during Discord OAuth2:', err); - throw new Error('Authentication failed'); + log.error('Error during Discord OAuth2:', err); + return res.json({ + "error": "Authentication failed" + }) } }; \ No newline at end of file