import * as express from 'express'
-import { waterfall } from 'async'
import { database as db } from '../../initializers/database'
-import { CONFIG, USER_ROLES } from '../../initializers'
-import { logger, getFormatedObjects } from '../../helpers'
+import { USER_ROLES, CONFIG } from '../../initializers'
+import { logger, getFormattedObjects } from '../../helpers'
import {
authenticate,
ensureIsAdmin,
+ ensureUserRegistrationAllowed,
usersAddValidator,
+ usersRegisterValidator,
usersUpdateValidator,
+ usersUpdateMeValidator,
usersRemoveValidator,
usersVideoRatingValidator,
+ usersGetValidator,
paginationValidator,
setPagination,
usersSortValidator,
setUsersSort,
token
} from '../../middlewares'
-import { UserVideoRate as FormatedUserVideoRate } from '../../../shared'
+import {
+ UserVideoRate as FormattedUserVideoRate,
+ UserCreate,
+ UserUpdate,
+ UserUpdateMe
+} from '../../../shared'
+import { UserInstance } from '../../models'
const usersRouter = express.Router()
listUsers
)
+usersRouter.get('/:id',
+ usersGetValidator,
+ getUser
+)
+
usersRouter.post('/',
authenticate,
ensureIsAdmin,
)
usersRouter.post('/register',
- ensureRegistrationEnabled,
- usersAddValidator,
- createUser
+ ensureUserRegistrationAllowed,
+ usersRegisterValidator,
+ registerUser
+)
+
+usersRouter.put('/me',
+ authenticate,
+ usersUpdateMeValidator,
+ updateMe
)
usersRouter.put('/:id',
authenticate,
+ ensureIsAdmin,
usersUpdateValidator,
updateUser
)
// ---------------------------------------------------------------------------
-function ensureRegistrationEnabled (req: express.Request, res: express.Response, next: express.NextFunction) {
- const registrationEnabled = CONFIG.SIGNUP.ENABLED
+function createUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const body: UserCreate = req.body
- if (registrationEnabled === true) {
- return next()
- }
+ const user = db.User.build({
+ username: body.username,
+ password: body.password,
+ email: body.email,
+ displayNSFW: false,
+ role: USER_ROLES.USER,
+ videoQuota: body.videoQuota
+ })
- return res.status(400).send('User registration is not enabled.')
+ user.save()
+ .then(() => res.type('json').status(204).end())
+ .catch(err => next(err))
}
-function createUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+function registerUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const body: UserCreate = req.body
+
const user = db.User.build({
- username: req.body.username,
- password: req.body.password,
- email: req.body.email,
+ username: body.username,
+ password: body.password,
+ email: body.email,
displayNSFW: false,
- role: USER_ROLES.USER
+ role: USER_ROLES.USER,
+ videoQuota: CONFIG.USER.VIDEO_QUOTA
})
- user.save().asCallback(function (err) {
- if (err) return next(err)
-
- return res.type('json').status(204).end()
- })
+ user.save()
+ .then(() => res.type('json').status(204).end())
+ .catch(err => next(err))
}
function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
- db.User.loadByUsername(res.locals.oauth.token.user.username, function (err, user) {
- if (err) return next(err)
+ db.User.loadByUsername(res.locals.oauth.token.user.username)
+ .then(user => res.json(user.toFormattedJSON()))
+ .catch(err => next(err))
+}
- return res.json(user.toFormatedJSON())
- })
+function getUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+ return res.json(res.locals.user.toFormattedJSON())
}
function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) {
- const videoId = '' + req.params.videoId
+ const videoId = +req.params.videoId
const userId = +res.locals.oauth.token.User.id
- db.UserVideoRate.load(userId, videoId, null, function (err, ratingObj) {
- if (err) return next(err)
-
- const rating = ratingObj ? ratingObj.type : 'none'
-
- const json: FormatedUserVideoRate = {
- videoId,
- rating
- }
- res.json(json)
- })
+ db.UserVideoRate.load(userId, videoId, null)
+ .then(ratingObj => {
+ const rating = ratingObj ? ratingObj.type : 'none'
+ const json: FormattedUserVideoRate = {
+ videoId,
+ rating
+ }
+ res.json(json)
+ })
+ .catch(err => next(err))
}
function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
- db.User.listForApi(req.query.start, req.query.count, req.query.sort, function (err, usersList, usersTotal) {
- if (err) return next(err)
-
- res.json(getFormatedObjects(usersList, usersTotal))
- })
+ db.User.listForApi(req.query.start, req.query.count, req.query.sort)
+ .then(resultList => {
+ res.json(getFormattedObjects(resultList.data, resultList.total))
+ })
+ .catch(err => next(err))
}
function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) {
- waterfall([
- function loadUser (callback) {
- db.User.loadById(req.params.id, callback)
- },
-
- function deleteUser (user, callback) {
- user.destroy().asCallback(callback)
- }
- ], function andFinally (err) {
- if (err) {
- logger.error('Errors when removed the user.', { error: err })
+ db.User.loadById(req.params.id)
+ .then(user => user.destroy())
+ .then(() => res.sendStatus(204))
+ .catch(err => {
+ logger.error('Errors when removed the user.', err)
return next(err)
- }
+ })
+}
- return res.sendStatus(204)
- })
+function updateMe (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const body: UserUpdateMe = req.body
+
+ // FIXME: user is not already a Sequelize instance?
+ db.User.loadByUsername(res.locals.oauth.token.user.username)
+ .then(user => {
+ if (body.password !== undefined) user.password = body.password
+ if (body.email !== undefined) user.email = body.email
+ if (body.displayNSFW !== undefined) user.displayNSFW = body.displayNSFW
+
+ return user.save()
+ })
+ .then(() => res.sendStatus(204))
+ .catch(err => next(err))
}
function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
- db.User.loadByUsername(res.locals.oauth.token.user.username, function (err, user) {
- if (err) return next(err)
-
- if (req.body.password) user.password = req.body.password
- if (req.body.displayNSFW !== undefined) user.displayNSFW = req.body.displayNSFW
+ const body: UserUpdate = req.body
+ const user: UserInstance = res.locals.user
- user.save().asCallback(function (err) {
- if (err) return next(err)
+ if (body.email !== undefined) user.email = body.email
+ if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota
- return res.sendStatus(204)
- })
- })
+ return user.save()
+ .then(() => res.sendStatus(204))
+ .catch(err => next(err))
}
function success (req: express.Request, res: express.Response, next: express.NextFunction) {