import * as express from 'express'
import { database as db } from '../../initializers/database'
-import { USER_ROLES } from '../../initializers'
-import { logger, getFormatedObjects } from '../../helpers'
+import { USER_ROLES, CONFIG } from '../../initializers'
+import { logger, getFormattedObjects } from '../../helpers'
import {
authenticate,
ensureIsAdmin,
- ensureUserRegistrationEnabled,
+ ensureUserRegistrationAllowed,
usersAddValidator,
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'
const usersRouter = express.Router()
listUsers
)
+usersRouter.get('/:id',
+ usersGetValidator,
+ getUser
+)
+
usersRouter.post('/',
authenticate,
ensureIsAdmin,
)
usersRouter.post('/register',
- ensureUserRegistrationEnabled,
+ ensureUserRegistrationAllowed,
usersAddValidator,
createUser
)
+usersRouter.put('/me',
+ authenticate,
+ usersUpdateMeValidator,
+ updateMe
+)
+
usersRouter.put('/:id',
authenticate,
+ ensureIsAdmin,
usersUpdateValidator,
updateUser
)
// ---------------------------------------------------------------------------
function createUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const body: UserCreate = req.body
+
+ // On registration, we set the user video quota
+ if (body.videoQuota === undefined) {
+ body.videoQuota = CONFIG.USER.VIDEO_QUOTA
+ }
+
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: body.videoQuota
})
user.save()
function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
db.User.loadByUsername(res.locals.oauth.token.user.username)
- .then(user => res.json(user.toFormatedJSON()))
+ .then(user => res.json(user.toFormattedJSON()))
.catch(err => next(err))
}
+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)
.then(ratingObj => {
const rating = ratingObj ? ratingObj.type : 'none'
- const json: FormatedUserVideoRate = {
+ const json: FormattedUserVideoRate = {
videoId,
rating
}
function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
db.User.listForApi(req.query.start, req.query.count, req.query.sort)
.then(resultList => {
- res.json(getFormatedObjects(resultList.data, resultList.total))
+ res.json(getFormattedObjects(resultList.data, resultList.total))
})
.catch(err => next(err))
}
.then(user => user.destroy())
.then(() => res.sendStatus(204))
.catch(err => {
- logger.error('Errors when removed the user.', { error: err })
+ logger.error('Errors when removed the user.', err)
return next(err)
})
}
-function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+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 (req.body.password) user.password = req.body.password
- if (req.body.displayNSFW !== undefined) user.displayNSFW = req.body.displayNSFW
+ 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()
})
.catch(err => next(err))
}
+function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const body: UserUpdate = req.body
+ const user = res.locals.user
+
+ if (body.email !== undefined) user.email = body.email
+ if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota
+
+ return user.save()
+ .then(() => res.sendStatus(204))
+ .catch(err => next(err))
+}
+
function success (req: express.Request, res: express.Response, next: express.NextFunction) {
res.end()
}