From 09f5b4f0bbb4d88e97d75dc014f549f2571cc135 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sat, 2 Sep 2023 21:05:27 +1000
Subject: Fix identify throwing on invalid token instead of closing with auth
 failed close code

---
 src/gateway/opcodes/Identify.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts
index e097e44c..9a3128d9 100644
--- a/src/gateway/opcodes/Identify.ts
+++ b/src/gateway/opcodes/Identify.ts
@@ -60,6 +60,14 @@ import { check } from "./instanceOf";
 // TODO: user sharding
 // TODO: check privileged intents, if defined in the config
 
+const tryGetUserFromToken = async (...args: Parameters<typeof checkToken>) => {
+	try {
+		return (await checkToken(...args)).user;
+	} catch (e) {
+		return null;
+	}
+};
+
 export async function onIdentify(this: WebSocket, data: Payload) {
 	if (this.user_id) {
 		// we've already identified
@@ -74,7 +82,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 
 	this.capabilities = new Capabilities(identify.capabilities || 0);
 
-	const { user } = await checkToken(identify.token, {
+	const user = await tryGetUserFromToken(identify.token, {
 		relations: ["relationships", "relationships.to", "settings"],
 		select: [...PrivateUserProjection, "relationships"],
 	});
-- 
cgit 1.4.1