-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 { logger } from '../../helpers'
-import { VideoInstance } from '../../models'
-
-function usersAddValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkBody('username', 'Should have a valid username').isUserUsernameValid()
- req.checkBody('password', 'Should have a valid password').isUserPasswordValid()
- req.checkBody('email', 'Should have a valid email').isEmail()
-
- logger.debug('Checking usersAdd parameters', { parameters: req.body })
-
- checkErrors(req, res, function () {
- db.User.loadByUsernameOrEmail(req.body.username, req.body.email)
- .then(user => {
- if (user) return res.status(409).send('User already exists.')
-
- next()
- })
- .catch(err => {
- logger.error('Error in usersAdd request validator.', err)
- return res.sendStatus(500)
- })
- })
-}
+import 'express-validator'
+import { body, param } from 'express-validator/check'
+import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
+import {
+ isAvatarFile,
+ isUserAutoPlayVideoValid, isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid,
+ isUserVideoQuotaValid
+} from '../../helpers/custom-validators/users'
+import { isVideoExist, isVideoFile } from '../../helpers/custom-validators/videos'
+import { logger } from '../../helpers/logger'
+import { isSignupAllowed } from '../../helpers/utils'
+import { CONSTRAINTS_FIELDS } from '../../initializers'
+import { UserModel } from '../../models/account/user'
+import { areValidationErrors } from './utils'
+
+const usersAddValidator = [
+ body('username').custom(isUserUsernameValid).withMessage('Should have a valid username (lowercase alphanumeric characters)'),
+ body('password').custom(isUserPasswordValid).withMessage('Should have a valid password'),
+ body('email').isEmail().withMessage('Should have a valid email'),
+ body('videoQuota').custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'),
+ body('role').custom(isUserRoleValid).withMessage('Should have a valid role'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking usersAdd parameters', { parameters: req.body })
+
+ if (areValidationErrors(req, res)) return
+ if (!await checkUserNameOrEmailDoesNotAlreadyExist(req.body.username, req.body.email, res)) return
+
+ return next()
+ }
+]
+
+const usersRegisterValidator = [
+ body('username').custom(isUserUsernameValid).withMessage('Should have a valid username'),
+ body('password').custom(isUserPasswordValid).withMessage('Should have a valid password'),
+ body('email').isEmail().withMessage('Should have a valid email'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking usersRegister parameters', { parameters: req.body })
+
+ if (areValidationErrors(req, res)) return
+ if (!await checkUserNameOrEmailDoesNotAlreadyExist(req.body.username, req.body.email, res)) return
+
+ return next()
+ }
+]
+
+const usersRemoveValidator = [
+ param('id').isInt().not().isEmpty().withMessage('Should have a valid id'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking usersRemove parameters', { parameters: req.params })
+
+ if (areValidationErrors(req, res)) return
+ if (!await checkUserIdExist(req.params.id, res)) return
+
+ const user = res.locals.user
+ if (user.username === 'root') {
+ return res.status(400)
+ .send({ error: 'Cannot remove the root user' })
+ .end()
+ }
-function usersRemoveValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isInt()
+ return next()
+ }
+]
- logger.debug('Checking usersRemove parameters', { parameters: req.params })
+const usersUpdateValidator = [
+ param('id').isInt().not().isEmpty().withMessage('Should have a valid id'),
+ body('email').optional().isEmail().withMessage('Should have a valid email attribute'),
+ body('videoQuota').optional().custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'),
+ body('role').optional().custom(isUserRoleValid).withMessage('Should have a valid role'),
- checkErrors(req, res, function () {
- db.User.loadById(req.params.id)
- .then(user => {
- if (!user) return res.status(404).send('User not found')
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking usersUpdate parameters', { parameters: req.body })
- if (user.username === 'root') return res.status(400).send('Cannot remove the root user')
+ if (areValidationErrors(req, res)) return
+ if (!await checkUserIdExist(req.params.id, res)) return
- next()
- })
- .catch(err => {
- logger.error('Error in usersRemove request validator.', err)
- return res.sendStatus(500)
- })
- })
-}
+ return next()
+ }
+]
-function usersUpdateValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isInt()
- // Add old password verification
- req.checkBody('password', 'Should have a valid password').optional().isUserPasswordValid()
- req.checkBody('displayNSFW', 'Should have a valid display Not Safe For Work attribute').optional().isUserDisplayNSFWValid()
+const usersUpdateMeValidator = [
+ body('password').optional().custom(isUserPasswordValid).withMessage('Should have a valid password'),
+ body('email').optional().isEmail().withMessage('Should have a valid email attribute'),
+ body('displayNSFW').optional().custom(isUserDisplayNSFWValid).withMessage('Should have a valid display Not Safe For Work attribute'),
+ body('autoPlayVideo').optional().custom(isUserAutoPlayVideoValid).withMessage('Should have a valid automatically plays video attribute'),
- logger.debug('Checking usersUpdate parameters', { parameters: req.body })
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ // TODO: Add old password verification
+ logger.debug('Checking usersUpdateMe parameters', { parameters: req.body })
- checkErrors(req, res, next)
-}
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
+const usersUpdateMyAvatarValidator = [
+ body('avatarfile').custom((value, { req }) => isAvatarFile(req.files)).withMessage(
+ 'This file is not supported. Please, make sure it is of the following type : '
+ + CONSTRAINTS_FIELDS.ACTOR.AVATAR.EXTNAME.join(', ')
+ ),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking usersUpdateMyAvatarValidator parameters', { parameters: req.body })
+
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
+const usersGetValidator = [
+ param('id').isInt().not().isEmpty().withMessage('Should have a valid id'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking usersGet parameters', { parameters: req.body })
+
+ if (areValidationErrors(req, res)) return
+ if (!await checkUserIdExist(req.params.id, res)) return
-function usersVideoRatingValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('videoId', 'Should have a valid video id').notEmpty().isVideoIdOrUUIDValid()
+ return next()
+ }
+]
- logger.debug('Checking usersVideoRating parameters', { parameters: req.params })
+const usersVideoRatingValidator = [
+ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'),
- checkErrors(req, res, function () {
- let videoPromise: Promise<VideoInstance>
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking usersVideoRating parameters', { parameters: req.params })
- if (validator.isUUID(req.params.videoId)) {
- videoPromise = db.Video.loadByUUID(req.params.videoId)
- } else {
- videoPromise = db.Video.load(req.params.videoId)
+ if (areValidationErrors(req, res)) return
+ if (!await isVideoExist(req.params.videoId, res)) return
+
+ return next()
+ }
+]
+
+const ensureUserRegistrationAllowed = [
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ const allowed = await isSignupAllowed()
+ if (allowed === false) {
+ return res.status(403)
+ .send({ error: 'User registration is not enabled or user limit is reached.' })
+ .end()
}
- videoPromise
- .then(video => {
- if (!video) return res.status(404).send('Video not found')
-
- next()
- })
- .catch(err => {
- logger.error('Error in user request validator.', err)
- return res.sendStatus(500)
- })
- })
-}
+ return next()
+ }
+]
// ---------------------------------------------------------------------------
export {
usersAddValidator,
+ usersRegisterValidator,
usersRemoveValidator,
usersUpdateValidator,
- usersVideoRatingValidator
+ usersUpdateMeValidator,
+ usersVideoRatingValidator,
+ ensureUserRegistrationAllowed,
+ usersGetValidator,
+ usersUpdateMyAvatarValidator
+}
+
+// ---------------------------------------------------------------------------
+
+async function checkUserIdExist (id: number, res: express.Response) {
+ const user = await UserModel.loadById(id)
+
+ if (!user) {
+ res.status(404)
+ .send({ error: 'User not found' })
+ .end()
+
+ return false
+ }
+
+ res.locals.user = user
+ return true
+}
+
+async function checkUserNameOrEmailDoesNotAlreadyExist (username: string, email: string, res: express.Response) {
+ const user = await UserModel.loadByUsernameOrEmail(username, email)
+
+ if (user) {
+ res.status(409)
+ .send({ error: 'User with this username of email already exists.' })
+ .end()
+ return false
+ }
+
+ return true
}
projects / github / Chocobozzz / PeerTube.git / blobdiff