-import * as express from 'express'
+import express from 'express'
import { body, param, query } from 'express-validator'
-import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
-import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy'
+import { isVideoRedundancyTarget } from '@server/helpers/custom-validators/video-redundancies'
+import { forceNumber } from '@shared/core-utils'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
+import {
+ exists,
+ isBooleanValid,
+ isIdOrUUIDValid,
+ isIdValid,
+ toBooleanOrNull,
+ toCompleteUUID,
+ toIntOrNull
+} from '../../helpers/custom-validators/misc'
import { isHostValid } from '../../helpers/custom-validators/servers'
+import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy'
import { ServerModel } from '../../models/server/server'
-import { doesVideoExist } from '../../helpers/middlewares'
-import { isVideoRedundancyTarget } from '@server/helpers/custom-validators/video-redundancies'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
+import { areValidationErrors, doesVideoExist, isValidVideoIdParam } from './shared'
const videoFileRedundancyGetValidator = [
- param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'),
+ isValidVideoIdParam('videoId'),
+
param('resolution')
.customSanitizer(toIntOrNull)
- .custom(exists).withMessage('Should have a valid resolution'),
+ .custom(exists),
param('fps')
.optional()
.customSanitizer(toIntOrNull)
- .custom(exists).withMessage('Should have a valid fps'),
+ .custom(exists),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking videoFileRedundancyGetValidator parameters', { parameters: req.params })
-
if (areValidationErrors(req, res)) return
if (!await doesVideoExist(req.params.videoId, res)) return
]
const videoPlaylistRedundancyGetValidator = [
- param('videoId')
- .custom(isIdOrUUIDValid)
- .not().isEmpty().withMessage('Should have a valid video id'),
+ isValidVideoIdParam('videoId'),
+
param('streamingPlaylistType')
.customSanitizer(toIntOrNull)
- .custom(exists).withMessage('Should have a valid streaming playlist type'),
+ .custom(exists),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking videoPlaylistRedundancyGetValidator parameters', { parameters: req.params })
-
if (areValidationErrors(req, res)) return
if (!await doesVideoExist(req.params.videoId, res)) return
]
const updateServerRedundancyValidator = [
- param('host').custom(isHostValid).withMessage('Should have a valid host'),
+ param('host')
+ .custom(isHostValid),
+
body('redundancyAllowed')
.customSanitizer(toBooleanOrNull)
- .custom(isBooleanValid).withMessage('Should have a valid redundancyAllowed attribute'),
+ .custom(isBooleanValid).withMessage('Should have a valid redundancyAllowed boolean'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking updateServerRedundancy parameters', { parameters: req.params })
-
if (areValidationErrors(req, res)) return
const server = await ServerModel.loadByHost(req.params.host)
const listVideoRedundanciesValidator = [
query('target')
- .custom(isVideoRedundancyTarget).withMessage('Should have a valid video redundancies target'),
+ .custom(isVideoRedundancyTarget),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking listVideoRedundanciesValidator parameters', { parameters: req.query })
-
if (areValidationErrors(req, res)) return
return next()
const addVideoRedundancyValidator = [
body('videoId')
- .custom(isIdValid)
- .withMessage('Should have a valid video id'),
+ .customSanitizer(toCompleteUUID)
+ .custom(isIdOrUUIDValid),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking addVideoRedundancyValidator parameters', { parameters: req.query })
-
if (areValidationErrors(req, res)) return
if (!await doesVideoExist(req.body.videoId, res, 'only-video')) return
const removeVideoRedundancyValidator = [
param('redundancyId')
- .custom(isIdValid)
- .withMessage('Should have a valid redundancy id'),
+ .custom(isIdValid),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking removeVideoRedundancyValidator parameters', { parameters: req.query })
-
if (areValidationErrors(req, res)) return
- const redundancy = await VideoRedundancyModel.loadByIdWithVideo(parseInt(req.params.redundancyId, 10))
+ const redundancy = await VideoRedundancyModel.loadByIdWithVideo(forceNumber(req.params.redundancyId))
if (!redundancy) {
return res.fail({
status: HttpStatusCode.NOT_FOUND_404,