aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares
diff options
context:
space:
mode:
Diffstat (limited to 'server/middlewares')
-rw-r--r--server/middlewares/servers.ts18
-rw-r--r--server/middlewares/validators/video-channels.ts19
2 files changed, 8 insertions, 29 deletions
diff --git a/server/middlewares/servers.ts b/server/middlewares/servers.ts
index eaf9aa144..488f9c368 100644
--- a/server/middlewares/servers.ts
+++ b/server/middlewares/servers.ts
@@ -20,26 +20,10 @@ function setBodyHostsPort (req: express.Request, res: express.Response, next: ex
20 return next() 20 return next()
21} 21}
22 22
23function setBodyHostPort (req: express.Request, res: express.Response, next: express.NextFunction) {
24 if (!req.body.host) return next()
25
26 const hostWithPort = getHostWithPort(req.body.host)
27
28 // Problem with the url parsing?
29 if (hostWithPort === null) {
30 return res.sendStatus(500)
31 }
32
33 req.body.host = hostWithPort
34
35 return next()
36}
37
38// --------------------------------------------------------------------------- 23// ---------------------------------------------------------------------------
39 24
40export { 25export {
41 setBodyHostsPort, 26 setBodyHostsPort
42 setBodyHostPort
43} 27}
44 28
45// --------------------------------------------------------------------------- 29// ---------------------------------------------------------------------------
diff --git a/server/middlewares/validators/video-channels.ts b/server/middlewares/validators/video-channels.ts
index 0326e05b9..c6fd3b59d 100644
--- a/server/middlewares/validators/video-channels.ts
+++ b/server/middlewares/validators/video-channels.ts
@@ -1,18 +1,13 @@
1import { body, param } from 'express-validator/check'
2import * as express from 'express' 1import * as express from 'express'
3 2import { body, param } from 'express-validator/check'
4import { checkErrors } from './utils' 3import { UserRight } from '../../../shared'
4import { checkVideoAccountExists } from '../../helpers/custom-validators/accounts'
5import { isVideoChannelDescriptionValid, isVideoChannelNameValid } from '../../helpers/custom-validators/video-channels'
6import { checkVideoChannelExists, isIdOrUUIDValid } from '../../helpers/index'
7import { logger } from '../../helpers/logger'
5import { database as db } from '../../initializers' 8import { database as db } from '../../initializers'
6import {
7 logger,
8 isIdOrUUIDValid,
9 isVideoChannelDescriptionValid,
10 isVideoChannelNameValid,
11 checkVideoChannelExists,
12 checkVideoAccountExists
13} from '../../helpers'
14import { UserInstance } from '../../models' 9import { UserInstance } from '../../models'
15import { UserRight } from '../../../shared' 10import { checkErrors } from './utils'
16 11
17const listVideoAccountChannelsValidator = [ 12const listVideoAccountChannelsValidator = [
18 param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'), 13 param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),