aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares/validators/utils.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-03 17:33:44 +0200
committerChocobozzz <me@florianbigard.com>2021-06-03 18:03:36 +0200
commit10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4 (patch)
tree008f8dad8032684f46105a261b27b2d6f05b36eb /server/middlewares/validators/utils.ts
parent5e08989ede1a340b9edb94465a11b1e04bf24094 (diff)
downloadPeerTube-10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4.tar.gz
PeerTube-10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4.tar.zst
PeerTube-10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4.zip
Move middleware utils in middlewares
helpers modules should not import models
Diffstat (limited to 'server/middlewares/validators/utils.ts')
-rw-r--r--server/middlewares/validators/utils.ts50
1 files changed, 0 insertions, 50 deletions
diff --git a/server/middlewares/validators/utils.ts b/server/middlewares/validators/utils.ts
deleted file mode 100644
index e291f1b17..000000000
--- a/server/middlewares/validators/utils.ts
+++ /dev/null
@@ -1,50 +0,0 @@
1import * as express from 'express'
2import { query, validationResult } from 'express-validator'
3import { logger } from '../../helpers/logger'
4
5function areValidationErrors (req: express.Request, res: express.Response) {
6 const errors = validationResult(req)
7
8 if (!errors.isEmpty()) {
9 logger.warn('Incorrect request parameters', { path: req.originalUrl, err: errors.mapped() })
10 res.fail({
11 message: 'Incorrect request parameters: ' + Object.keys(errors.mapped()).join(', '),
12 instance: req.originalUrl,
13 data: {
14 'invalid-params': errors.mapped()
15 }
16 })
17
18 return true
19 }
20
21 return false
22}
23
24function checkSort (sortableColumns: string[], tags: string[] = []) {
25 return [
26 query('sort').optional().isIn(sortableColumns).withMessage('Should have correct sortable column'),
27
28 (req: express.Request, res: express.Response, next: express.NextFunction) => {
29 logger.debug('Checking sort parameters', { parameters: req.query, tags })
30
31 if (areValidationErrors(req, res)) return
32
33 return next()
34 }
35 ]
36}
37
38function createSortableColumns (sortableColumns: string[]) {
39 const sortableColumnDesc = sortableColumns.map(sortableColumn => '-' + sortableColumn)
40
41 return sortableColumns.concat(sortableColumnDesc)
42}
43
44// ---------------------------------------------------------------------------
45
46export {
47 areValidationErrors,
48 checkSort,
49 createSortableColumns
50}