Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix identify throwing on invalid token instead of closing with auth failed close code

Browse Source
This commit is contained in:
Madeline 2023-09-02 21:05:27 +10:00
parent 2fc3c5dbd4
commit 09f5b4f0bb
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gateway/opcodes/Identify.ts
View File

@ -60,6 +60,14 @@ import { check } from "./instanceOf";
// TODO: user sharding // TODO: user sharding
// TODO: check privileged intents, if defined in the config // 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) { export async function onIdentify(this: WebSocket, data: Payload) {
if (this.user_id) { if (this.user_id) {
// we've already identified // we've already identified
@ -74,7 +82,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
this.capabilities = new Capabilities(identify.capabilities || 0); this.capabilities = new Capabilities(identify.capabilities || 0);
const { user } = await checkToken(identify.token, { const user = await tryGetUserFromToken(identify.token, {
relations: ["relationships", "relationships.to", "settings"], relations: ["relationships", "relationships.to", "settings"],
select: [...PrivateUserProjection, "relationships"], select: [...PrivateUserProjection, "relationships"],
}); });