Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"description": "",
"dependencies": {
"@electric-sql/pglite": "^0.2.17",
"@types/morgan": "^1.9.10",
"@types/multer": "^1.4.12",
"axios": "^1.8.4",
"bcryptjs": "^3.0.2",
Expand All @@ -38,6 +39,7 @@
"jsdom": "^26.1.0",
"json2csv": "^6.0.0-alpha.2",
"jsonwebtoken": "^9.0.2",
"morgan": "^1.10.1",
"multer": "^2.1.1",
"nodemailer": "^8.0.3",
"papaparse": "^5.5.2",
Expand Down
6 changes: 5 additions & 1 deletion backend/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import { initRoles } from './src/database/initdb/initrole'
import {initEvent} from './src/database/initdb/initevent'
import {initChallenge} from './src/database/initdb/initChallenge'
import { authenticateUser } from './src/middlewares/auth.middleware';
import { requestLogger } from './src/middlewares/request-logger.middleware';
import { errorLogger } from './src/middlewares/error-logger.middleware';

dotenv.config();

Expand All @@ -36,6 +38,7 @@ async function startServer() {
app.use(cors({ origin: "*" }));
app.use(bodyParser.json());
app.use(express.urlencoded({ extended: true }));
app.use(requestLogger);


try {
Expand Down Expand Up @@ -67,6 +70,7 @@ async function startServer() {
app.use("/api/uploads/foodmenu", express.static(path.join(__dirname, "/uploads/foodmenu")));
app.use("/api/uploads/plannings", express.static(path.join(__dirname, "/uploads/plannings")));
app.use("/api/exports/bus", express.static(path.join(__dirname, "/exports/bus")));
app.use(errorLogger);

// Démarrage du serveur
app.listen(server_port, () => {
Expand All @@ -78,4 +82,4 @@ async function startServer() {
}
}

startServer();
startServer();
21 changes: 21 additions & 0 deletions backend/src/middlewares/error-logger.middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { ErrorRequestHandler } from 'express';

export const errorLogger: ErrorRequestHandler = (err, req, _res, next) => {
const statusCode =
typeof err?.statusCode === 'number'
? err.statusCode
: typeof err?.status === 'number'
? err.status
: 500;

console.error('[request-error]', {
timestamp: new Date().toISOString(),
method: req.method,
url: req.originalUrl,
statusCode,
message: err?.message || 'Unknown error',
stack: err?.stack
});

next(err);
};
20 changes: 20 additions & 0 deletions backend/src/middlewares/request-logger.middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Request } from 'express';
import morgan from 'morgan';

function getClientIp(req: Request): string {
const forwardedFor = req.headers['x-forwarded-for'];

if (typeof forwardedFor === 'string' && forwardedFor.length > 0) {
return forwardedFor.split(',')[0].trim();
}

if (Array.isArray(forwardedFor) && forwardedFor.length > 0) {
return forwardedFor[0];
}

return req.ip || req.socket.remoteAddress || 'unknown';
}

morgan.token('client-ip', (req: Request) => getClientIp(req));

export const requestLogger = morgan(':method :url :status :response-time ms - :client-ip');