From 4c61c89fd7696e7ddb7b8a25f4a9310abdb24c66 Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Wed, 26 Apr 2023 11:13:15 -0400 Subject: [PATCH] Move error 16 directly after error 15 in auth middleware --- src/middleware/auth.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/middleware/auth.ts b/src/middleware/auth.ts index 5f5e42f..10187ae 100644 --- a/src/middleware/auth.ts +++ b/src/middleware/auth.ts @@ -39,6 +39,11 @@ async function auth(request: express.Request, response: express.Response, next: return badAuth(response, 15, 'NO_TOKEN'); } + const pid: number = getPIDFromServiceToken(token); + if (pid === 0) { + return badAuth(response, 16, 'BAD_TOKEN'); + } + const paramPack: string | undefined = getValueFromHeaders(request.headers, 'x-nintendo-parampack'); if (!paramPack) { return badAuth(response, 17, 'NO_PARAM'); @@ -50,12 +55,6 @@ async function auth(request: express.Request, response: express.Response, next: return badAuth(response, 18, 'BAD_PARAM'); } - const pid: number = getPIDFromServiceToken(token); - - if (pid === 0) { - return badAuth(response, 16, 'BAD_TOKEN'); - } - const user: HydratedPNIDDocument | null = await getPNID(pid); let discovery: HydratedEndpointDocument | null; if (user) {