Server: update express-validator

This commit is contained in:
Chocobozzz 2017-02-10 11:27:14 +01:00
parent c70e0710b3
commit f6f7dfee01
3 changed files with 19 additions and 5 deletions

View File

@ -51,7 +51,7 @@
"dezalgo": "^1.0.3",
"express": "^4.12.4",
"express-oauth-server": "https://github.com/Chocobozzz/express-oauth-server",
"express-validator": "^2.11.0",
"express-validator": "^3.1.0",
"fluent-ffmpeg": "^2.1.0",
"js-yaml": "^3.5.4",
"lodash": "^4.11.1",

View File

@ -21,7 +21,8 @@ const videosValidators = {
isVideoExtnameValid,
isVideoRemoteIdValid,
isVideoAbuseReasonValid,
isVideoAbuseReporterUsernameValid
isVideoAbuseReporterUsernameValid,
isVideoFile
}
function isVideoAuthorValid (value) {
@ -81,6 +82,21 @@ function isVideoAbuseReporterUsernameValid (value) {
return usersValidators.isUserUsernameValid(value)
}
function isVideoFile (value, files) {
// Should have files
if (!files) return false
// Should have videofile file
const videofile = files.videofile
if (!videofile || videofile.length === 0) return false
// The file should exist
const file = videofile[0]
if (!file || !file.originalname) return false
return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype)
}
// ---------------------------------------------------------------------------
module.exports = videosValidators

View File

@ -17,9 +17,7 @@ const validatorsVideos = {
}
function videosAdd (req, res, next) {
req.checkFiles('videofile[0].originalname', 'Should have an input video').notEmpty()
// TODO: move to constants and function
req.checkFiles('videofile[0].mimetype', 'Should have a correct mime type').matches(/video\/(webm)|(mp4)|(ogg)/i)
req.checkBody('videofile', 'Should have a valid file').isVideoFile(req.files)
req.checkBody('name', 'Should have a valid name').isVideoNameValid()
req.checkBody('description', 'Should have a valid description').isVideoDescriptionValid()
req.checkBody('tags', 'Should have correct tags').isVideoTagsValid()