Remove one pod (#76)

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / videos.ts

diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts
index ec452cade5482abcbfb073b6b56c99ef45f5d976..bd223a1cb15b3096f4365e7f4a19ee516d489838 100644 (file)
--- a/server/middlewares/validators/videos.ts
+++ b/server/middlewares/validators/videos.ts
@@ -1,10 +1,13 @@
 import 'express-validator'
 import * as express from 'express'
+import * as Promise from 'bluebird'
+import * as validator from 'validator'
 
 import { database as db } from '../../initializers/database'
 import { checkErrors } from './utils'
 import { CONSTRAINTS_FIELDS, SEARCHABLE_COLUMNS } from '../../initializers'
 import { logger, isVideoDurationValid } from '../../helpers'
+import { VideoInstance } from '../../models'
 
 function videosAddValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
   // FIXME: Don't write an error message, it seems there is a bug with express-validator
@@ -20,7 +23,7 @@ function videosAddValidator (req: express.Request, res: express.Response, next:
 
   logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files })
 
-  checkErrors(req, res, function () {
+  checkErrors(req, res, () => {
     const videoFile = req.files.videofile[0]
 
     db.Video.getDurationFromFile(videoFile.path)
@@ -33,14 +36,14 @@ function videosAddValidator (req: express.Request, res: express.Response, next:
         next()
       })
       .catch(err => {
-        logger.error('Error in getting duration from file.', { error: err })
+        logger.error('Error in getting duration from file.', err)
         res.status(400).send('Cannot retrieve metadata of the file.')
       })
   })
 }
 
 function videosUpdateValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
-  req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+  req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
   req.checkBody('name', 'Should have a valid name').optional().isVideoNameValid()
   req.checkBody('category', 'Should have a valid category').optional().isVideoCategoryValid()
   req.checkBody('licence', 'Should have a valid licence').optional().isVideoLicenceValid()
@@ -51,8 +54,8 @@ function videosUpdateValidator (req: express.Request, res: express.Response, nex
 
   logger.debug('Checking videosUpdate parameters', { parameters: req.body })
 
-  checkErrors(req, res, function () {
-    checkVideoExists(req.params.id, res, function () {
+  checkErrors(req, res, () => {
+    checkVideoExists(req.params.id, res, () => {
       // We need to make additional checks
       if (res.locals.video.isOwned() === false) {
         return res.status(403).send('Cannot update video of another pod')
@@ -68,26 +71,26 @@ function videosUpdateValidator (req: express.Request, res: express.Response, nex
 }
 
 function videosGetValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
-  req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+  req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
 
   logger.debug('Checking videosGet parameters', { parameters: req.params })
 
-  checkErrors(req, res, function () {
+  checkErrors(req, res, () => {
     checkVideoExists(req.params.id, res, next)
   })
 }
 
 function videosRemoveValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
-  req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+  req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
 
   logger.debug('Checking videosRemove parameters', { parameters: req.params })
 
-  checkErrors(req, res, function () {
-    checkVideoExists(req.params.id, res, function () {
+  checkErrors(req, res, () => {
+    checkVideoExists(req.params.id, res, () => {
       // We need to make additional checks
 
       // Check if the user who did the request is able to delete the video
-      checkUserCanDeleteVideo(res.locals.oauth.token.User.id, res, function () {
+      checkUserCanDeleteVideo(res.locals.oauth.token.User.id, res, () => {
         next()
       })
     })
@@ -105,34 +108,34 @@ function videosSearchValidator (req: express.Request, res: express.Response, nex
 }
 
 function videoAbuseReportValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
-  req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+  req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
   req.checkBody('reason', 'Should have a valid reason').isVideoAbuseReasonValid()
 
   logger.debug('Checking videoAbuseReport parameters', { parameters: req.body })
 
-  checkErrors(req, res, function () {
+  checkErrors(req, res, () => {
     checkVideoExists(req.params.id, res, next)
   })
 }
 
 function videoRateValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
-  req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+  req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
   req.checkBody('rating', 'Should have a valid rate type').isVideoRatingTypeValid()
 
   logger.debug('Checking videoRate parameters', { parameters: req.body })
 
-  checkErrors(req, res, function () {
+  checkErrors(req, res, () => {
     checkVideoExists(req.params.id, res, next)
   })
 }
 
 function videosBlacklistValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
-  req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+  req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
 
   logger.debug('Checking videosBlacklist parameters', { parameters: req.params })
 
-  checkErrors(req, res, function () {
-    checkVideoExists(req.params.id, res, function () {
+  checkErrors(req, res, () => {
+    checkVideoExists(req.params.id, res, () => {
       checkVideoIsBlacklistable(req, res, next)
     })
   })
@@ -157,14 +160,21 @@ export {
 // ---------------------------------------------------------------------------
 
 function checkVideoExists (id: string, res: express.Response, callback: () => void) {
-  db.Video.loadAndPopulateAuthorAndPodAndTags(id).then(video => {
+  let promise: Promise<VideoInstance>
+  if (validator.isInt(id)) {
+    promise = db.Video.loadAndPopulateAuthorAndPodAndTags(+id)
+  } else { // UUID
+    promise = db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(id)
+  }
+
+  promise.then(video => {
     if (!video) return res.status(404).send('Video not found')
 
     res.locals.video = video
     callback()
   })
   .catch(err => {
-    logger.error('Error in video request validator.', { error: err })
+    logger.error('Error in video request validator.', err)
     return res.sendStatus(500)
   })
 }
@@ -190,7 +200,7 @@ function checkUserCanDeleteVideo (userId: number, res: express.Response, callbac
       callback()
     })
     .catch(err => {
-      logger.error('Error in video request validator.', { error: err })
+      logger.error('Error in video request validator.', err)
       return res.sendStatus(500)
     })
 }