From dd6b7ee4ef588f966e549b09a939277f3d9c50a7 Mon Sep 17 00:00:00 2001 From: Sainan Date: Fri, 3 Jan 2025 08:44:19 +0100 Subject: [PATCH] fix: handle 'Invalid accountId-nonce pair' error for all controllers --- src/controllers/api/inventoryController.ts | 8 +------- src/middleware/errorHandler.ts | 4 +++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index f38fe0ec..747df001 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -18,13 +18,7 @@ import { import { handleSubsumeCompletion } from "./infestedFoundryController"; export const inventoryController: RequestHandler = async (request, response) => { - let account; - try { - account = await getAccountForRequest(request); - } catch (e) { - response.status(400).send("Log-in expired"); - return; - } + const account = await getAccountForRequest(request); const inventory = await Inventory.findOne({ accountOwnerId: account._id.toString() }) .populate<{ LoadOutPresets: ILoadoutDatabase }>("LoadOutPresets") diff --git a/src/middleware/errorHandler.ts b/src/middleware/errorHandler.ts index f4669e1f..d5b83950 100644 --- a/src/middleware/errorHandler.ts +++ b/src/middleware/errorHandler.ts @@ -2,7 +2,9 @@ import { NextFunction, Request, Response } from "express"; import { logger } from "../utils/logger"; export const errorHandler = (err: Error, req: Request, res: Response, _next: NextFunction): void => { - if (err.stack) { + if (err.message == "Invalid accountId-nonce pair") { + res.status(400).json("Log-in expired"); + } else if (err.stack) { const stackArr = err.stack.split("\n"); stackArr[0] += ` while processing ${req.path} request`; logger.error(stackArr.join("\n"));