From 7ee7d6bdb08bd1926bd48784fa2cdbd03ca930c4 Mon Sep 17 00:00:00 2001 From: Type-Style Date: Mon, 25 Mar 2024 16:26:46 +0100 Subject: [PATCH] [Task] #50, cleanup cetntralized; rename token functions --- src/app.ts | 9 ++++++++- src/middleware/logged-in.ts | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/app.ts b/src/app.ts index d7e1084..ff7a87e 100644 --- a/src/app.ts +++ b/src/app.ts @@ -12,7 +12,8 @@ import readRouter from '@src/controller/read'; import loginRouter from '@src/controller/login'; import path from 'path'; import logger from '@src/scripts/logger'; -import { baseRateLimiter } from './middleware/limit'; +import { baseRateLimiter, cleanup as cleanupRateLimitedIps } from './middleware/limit'; +import { cleanupCSRF } from "@src/scripts/token"; // configurations config(); // dotenv @@ -75,6 +76,12 @@ const server = app.listen(80, () => { logger.log(`Server running //localhost:80, ENV: ${process.env.NODE_ENV}`, true); }); +// scheduled cleanup +setInterval(() => { + cleanupCSRF(); + cleanupRateLimitedIps(); +}, 1000 * 60 * 5); + // catching shutdowns ['SIGINT', 'SIGTERM', 'exit'].forEach((signal) => { process.on(signal, () => { diff --git a/src/middleware/logged-in.ts b/src/middleware/logged-in.ts index eddca04..f6546ba 100644 --- a/src/middleware/logged-in.ts +++ b/src/middleware/logged-in.ts @@ -1,10 +1,10 @@ import { Request, Response, NextFunction } from 'express'; -import { validateToken } from '@src/scripts/token'; +import { validateJWT } from '@src/scripts/token'; import { create as createError } from '@src/middleware/error'; export function isLoggedIn(req: Request, res: Response, next: NextFunction) { - const result = validateToken(req); + const result = validateJWT(req); if (!result.success) { createError(res, result.status, result.message || "", next) } else {