import { database as db } from '../../initializers/database'
import { checkErrors } from './utils'
import { isSignupAllowed, logger } from '../../helpers'
-import { VideoInstance } from '../../models'
+import { UserInstance, VideoInstance } from '../../models'
function usersAddValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
req.checkBody('username', 'Should have a valid username').isUserUsernameValid()
logger.debug('Checking usersAdd parameters', { parameters: req.body })
checkErrors(req, res, () => {
- db.User.loadByUsernameOrEmail(req.body.username, req.body.email)
- .then(user => {
- if (user) return res.status(409).send('User already exists.')
+ checkUserDoesNotAlreadyExist(req.body.username, req.body.email, res, next)
+ })
+}
- next()
- })
- .catch(err => {
- logger.error('Error in usersAdd request validator.', err)
- return res.sendStatus(500)
- })
+function usersRegisterValidator (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 usersRegister parameters', { parameters: req.body })
+
+ checkErrors(req, res, () => {
+ checkUserDoesNotAlreadyExist(req.body.username, req.body.email, res, next)
})
}
logger.debug('Checking usersRemove parameters', { parameters: req.params })
checkErrors(req, res, () => {
- db.User.loadById(req.params.id)
- .then(user => {
- if (!user) return res.status(404).send('User not found')
+ checkUserExists(req.params.id, res, (err, user) => {
+ if (err) {
+ logger.error('Error in usersRemoveValidator.', err)
+ return res.sendStatus(500)
+ }
- if (user.username === 'root') return res.status(400).send('Cannot remove the root user')
+ if (user.username === 'root') return res.status(400).send('Cannot remove the root user')
- next()
- })
- .catch(err => {
- logger.error('Error in usersRemove request validator.', err)
- return res.sendStatus(500)
- })
+ next()
+ })
})
}
req.checkBody('email', 'Should have a valid email attribute').optional().isEmail()
req.checkBody('displayNSFW', 'Should have a valid display Not Safe For Work attribute').optional().isUserDisplayNSFWValid()
- logger.debug('Checking usersUpdate parameters', { parameters: req.body })
+ logger.debug('Checking usersUpdateMe parameters', { parameters: req.body })
checkErrors(req, res, next)
}
export {
usersAddValidator,
+ usersRegisterValidator,
usersRemoveValidator,
usersUpdateValidator,
usersUpdateMeValidator,
// ---------------------------------------------------------------------------
-function checkUserExists (id: number, res: express.Response, callback: () => void) {
+function checkUserExists (id: number, res: express.Response, callback: (err: Error, user: UserInstance) => void) {
db.User.loadById(id)
.then(user => {
if (!user) return res.status(404).send('User not found')
res.locals.user = user
- callback()
+ callback(null, user)
})
.catch(err => {
logger.error('Error in user request validator.', err)
return res.sendStatus(500)
})
}
+
+function checkUserDoesNotAlreadyExist (username: string, email: string, res: express.Response, callback: () => void) {
+ db.User.loadByUsernameOrEmail(username, email)
+ .then(user => {
+ if (user) return res.status(409).send('User already exists.')
+
+ callback()
+ })
+ .catch(err => {
+ logger.error('Error in usersAdd request validator.', err)
+ return res.sendStatus(500)
+ })
+}