Merge branch 'main' of https://github.com/skyblockstats/skyblock-api into main

1 files changed, 8 insertions, 1 deletions

diff --git a/src/index.ts b/src/index.ts
index 4f4ad00..647038f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -132,7 +132,12 @@ app.get('/constants', async(req, res) => {
 app.post('/accounts/createsession', async(req, res) => {
 	try {
 		const { code } = req.body
-		const { access_token: accessToken, refresh_token: refreshToken } = await discord.exchangeCode(`${mainSiteUrl}/loggedin`, code)
+		const codeExchange = await discord.exchangeCode(`${mainSiteUrl}/loggedin`, code)
+		if (!codeExchange) {
+			res.json({ ok: false, error: 'discord_client_secret isn\'t in env' })
+			return
+		}
+		const { access_token: accessToken, refresh_token: refreshToken } = codeExchange
 		if (!accessToken)
 			// access token is invalid :(
 			return res.json({ ok: false })
@@ -148,6 +153,8 @@ app.post('/accounts/session', async(req, res) => {
 	try {
 		const { uuid } = req.body
 		const session = await fetchSession(uuid)
+		if (!session)
+			return res.json({ ok: false })
 		const account = await fetchAccountFromDiscord(session.discord_user.id)
 		res.json({ session, account })
 	} catch (err) {