Upgrade expressjs (#1633)

* 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

apps/server/src/api-data/assets/assets.controller.ts

@@ -1,41 +0,0 @@
-import { defaultCss } from '../../user/styles/bundledCss.js';
-import type { Request, Response } from 'express';
-import { readCssFile, writeCssFile } from './assets.service.js';
-
-/**
- * Exposes the contents of the cssOverride.css file
- */
-export async function getCssOverride(_req: Request, res: Response) {
-  try {
-    const data = await readCssFile();
-    res.status(200).send(data);
-  } catch (error) {
-    res.status(500).send({ message: error });
-  }
-}
-
-/**
- * Allows modifying the cssOverride.css file
- */
-export async function postCssOverride(req: Request, res: Response) {
-  const { css } = req.body;
-
-  try {
-    await writeCssFile(css);
-    res.status(204).send();
-  } catch (error) {
-    res.status(500).send({ message: error });
-  }
-}
-
-/**
- * Restores the default cssOverride.css file
- */
-export async function restoreCss(_req: Request, res: Response) {
-  try {
-    await writeCssFile(defaultCss);
-    res.status(200).send(defaultCss);
-  } catch (error) {
-    res.status(500).send({ message: error });
-  }
-}

apps/server/src/api-data/assets/assets.router.ts

@@ -1,10 +1,40 @@
 import express from 'express';
-
-import { getCssOverride, postCssOverride, restoreCss } from './assets.controller.js';
+import type { Request, Response } from 'express';
+import type { ErrorResponse } from 'ontime-types';
 import { validatePostCss } from './assets.validation.js';
+import { readCssFile, writeCssFile } from './assets.service.js';
+import { getErrorMessage } from 'ontime-utils';
+import { defaultCss } from '../../user/styles/bundledCss.js';
 
 export const router = express.Router();
 
-router.get('/css', getCssOverride);
-router.post('/css', validatePostCss, postCssOverride);
-router.post('/css/restore', restoreCss);
+router.get('/css', async (_req: Request, res: Response<string | ErrorResponse>) => {
+  try {
+    const data = await readCssFile();
+    res.status(200).send(data);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(500).send({ message });
+  }
+});
+
+router.post('/css', validatePostCss, async (req: Request, res: Response<never | ErrorResponse>) => {
+  const { css } = req.body;
+  try {
+    await writeCssFile(css);
+    res.status(204).send();
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(500).send({ message });
+  }
+});
+
+router.post('/css/restore', async (_req: Request, res: Response<string | ErrorResponse>) => {
+  try {
+    await writeCssFile(defaultCss);
+    res.status(200).send(defaultCss);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(500).send({ message });
+  }
+});

apps/server/src/api-data/assets/assets.validation.ts

@@ -1,12 +1,4 @@
-import { Request, Response, NextFunction } from 'express';
-import { body, validationResult } from 'express-validator';
+import { body } from 'express-validator';
+import { requestValidationFunction } from '../validation-utils/validationFunction.js';
 
-export const validatePostCss = [
-  body('css').isString().trim(),
-
-  (req: Request, res: Response, next: NextFunction) => {
-    const errors = validationResult(req);
-    if (!errors.isEmpty()) return res.status(422).json({ errors: errors.array() });
-    next();
-  },
-];
+export const validatePostCss = [body('css').isString().trim(), requestValidationFunction];