cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-09 09:23:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Upgrade expressjs (#1633)

Browse Source 
* upgrade expressjs

* migration

* reenable test

* extend timeout on download test

* fixup! migration

* move empty body test from controller to validator

* enusre not empty

* extract validation function

* fixup! reenable test

* remove thin controllers

* disable e2e test of project file download
This commit is contained in:
Alex Christoffer Rasmussen
2025-06-12 15:02:35 +02:00
committed by GitHub
parent 2a5b053d97
commit a4b15970de
39 changed files with 590 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/api-data/sheets/sheets.validation.ts
+10 -17
View File
@@ -2,6 +2,7 @@ import { isImportMap } from 'ontime-utils';
import { body, param, validationResult } from 'express-validator';
import { NextFunction, Request, Response } from 'express';
import { requestValidationFunction } from '../validation-utils/validationFunction.js';
export const validateRequestConnection = [
param('sheetId')
@@ -14,27 +15,23 @@ export const validateRequestConnection = [
(req: Request, res: Response, next: NextFunction) => {
const errors = validationResult(req);
if (!errors.isEmpty()) return res.status(422).json({ errors: errors.array() });
if (!errors.isEmpty()) {
res.status(422).json({ errors: errors.array() });
return;
}
// check that the file exists
if (!req.file) {
return res.status(422).json({ errors: 'File not found' });
res.status(422).json({ errors: 'File not found' });
return;
}
next();
},
];
export const validateSheetId = [
param('sheetId').isString(),
(req: Request, res: Response, next: NextFunction) => {
const errors = validationResult(req);
if (!errors.isEmpty()) return res.status(422).json({ errors: errors.array() });
next();
},
];
export const validateSheetId = [param('sheetId').isString().trim().notEmpty(), requestValidationFunction];
export const validateSheetOptions = [
param('sheetId').isString(),
param('sheetId').isString().trim().notEmpty(),
body('options')
.isObject()
.custom((content) => {
@@ -42,9 +39,5 @@ export const validateSheetOptions = [
return isValid;
}),
(req: Request, res: Response, next: NextFunction) => {
const errors = validationResult(req);
if (!errors.isEmpty()) return res.status(422).json({ errors: errors.array() });
next();
},
requestValidationFunction,
];