import * as express from 'express'
-
-import { database as db } from '../../initializers/database'
-import { USER_ROLES } from '../../initializers'
-import { logger, getFormatedObjects } from '../../helpers'
+import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared'
+import { getFormattedObjects, logger, retryTransactionWrapper } from '../../helpers'
+import { CONFIG } from '../../initializers'
+import { createUserAccountAndChannel } from '../../lib/user'
import {
+ asyncMiddleware,
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight,
ensureUserRegistrationAllowed,
- usersAddValidator,
- usersUpdateValidator,
- usersRemoveValidator,
- usersVideoRatingValidator,
paginationValidator,
setPagination,
- usersSortValidator,
setUsersSort,
- token
+ setVideosSort,
+ token,
+ usersAddValidator,
+ usersGetValidator,
+ usersRegisterValidator,
+ usersRemoveValidator,
+ usersSortValidator,
+ usersUpdateMeValidator,
+ usersUpdateValidator,
+ usersVideoRatingValidator
} from '../../middlewares'
-import { UserVideoRate as FormatedUserVideoRate, UserCreate, UserUpdate } from '../../../shared'
+import { videosSortValidator } from '../../middlewares/validators'
+import { AccountVideoRateModel } from '../../models/account/account-video-rate'
+import { UserModel } from '../../models/account/user'
+import { VideoModel } from '../../models/video/video'
const usersRouter = express.Router()
usersRouter.get('/me',
authenticate,
- getUserInformation
+ asyncMiddleware(getUserInformation)
+)
+
+usersRouter.get('/me/videos',
+ authenticate,
+ paginationValidator,
+ videosSortValidator,
+ setVideosSort,
+ setPagination,
+ asyncMiddleware(getUserVideos)
)
usersRouter.get('/me/videos/:videoId/rating',
authenticate,
- usersVideoRatingValidator,
- getUserVideoRating
+ asyncMiddleware(usersVideoRatingValidator),
+ asyncMiddleware(getUserVideoRating)
)
usersRouter.get('/',
+ authenticate,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
paginationValidator,
usersSortValidator,
setUsersSort,
setPagination,
- listUsers
+ asyncMiddleware(listUsers)
+)
+
+usersRouter.get('/:id',
+ asyncMiddleware(usersGetValidator),
+ getUser
)
usersRouter.post('/',
authenticate,
- ensureIsAdmin,
- usersAddValidator,
- createUser
+ ensureUserHasRight(UserRight.MANAGE_USERS),
+ asyncMiddleware(usersAddValidator),
+ asyncMiddleware(createUserRetryWrapper)
)
usersRouter.post('/register',
- ensureUserRegistrationAllowed,
- usersAddValidator,
- createUser
+ asyncMiddleware(ensureUserRegistrationAllowed),
+ asyncMiddleware(usersRegisterValidator),
+ asyncMiddleware(registerUserRetryWrapper)
+)
+
+usersRouter.put('/me',
+ authenticate,
+ usersUpdateMeValidator,
+ asyncMiddleware(updateMe)
)
usersRouter.put('/:id',
authenticate,
- usersUpdateValidator,
- updateUser
+ ensureUserHasRight(UserRight.MANAGE_USERS),
+ asyncMiddleware(usersUpdateValidator),
+ asyncMiddleware(updateUser)
)
usersRouter.delete('/:id',
authenticate,
- ensureIsAdmin,
- usersRemoveValidator,
- removeUser
+ ensureUserHasRight(UserRight.MANAGE_USERS),
+ asyncMiddleware(usersRemoveValidator),
+ asyncMiddleware(removeUser)
)
usersRouter.post('/token', token, success)
// ---------------------------------------------------------------------------
-function createUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function getUserVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const user = res.locals.oauth.token.User as UserModel
+ const resultList = await VideoModel.listUserVideosForApi(user.id ,req.query.start, req.query.count, req.query.sort)
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+async function createUserRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const options = {
+ arguments: [ req ],
+ errorMessage: 'Cannot insert the user with many retries.'
+ }
+
+ await retryTransactionWrapper(createUser, options)
+
+ // TODO : include Location of the new user -> 201
+ return res.type('json').status(204).end()
+}
+
+async function createUser (req: express.Request) {
+ const body: UserCreate = req.body
+ const user = new UserModel({
+ username: body.username,
+ password: body.password,
+ email: body.email,
+ displayNSFW: false,
+ autoPlayVideo: true,
+ role: body.role,
+ videoQuota: body.videoQuota
+ })
+
+ await createUserAccountAndChannel(user)
+
+ logger.info('User %s with its channel and account created.', body.username)
+}
+
+async function registerUserRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const options = {
+ arguments: [ req ],
+ errorMessage: 'Cannot insert the user with many retries.'
+ }
+
+ await retryTransactionWrapper(registerUser, options)
+
+ return res.type('json').status(204).end()
+}
+
+async function registerUser (req: express.Request) {
const body: UserCreate = req.body
- const user = db.User.build({
+ const user = new UserModel({
username: body.username,
password: body.password,
email: body.email,
displayNSFW: false,
- role: USER_ROLES.USER
+ autoPlayVideo: true,
+ role: UserRole.USER,
+ videoQuota: CONFIG.USER.VIDEO_QUOTA
})
- user.save()
- .then(() => res.type('json').status(204).end())
- .catch(err => next(err))
+ await createUserAccountAndChannel(user)
+
+ logger.info('User %s with its channel and account registered.', body.username)
}
-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()))
- .catch(err => next(err))
+async function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
+ // We did not load channels in res.locals.user
+ const user = await UserModel.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username)
+
+ return res.json(user.toFormattedJSON())
+}
+
+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) {
+async function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) {
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 = {
- videoId,
- rating
- }
- res.json(json)
- })
- .catch(err => next(err))
+ const accountId = +res.locals.oauth.token.User.Account.id
+
+ const ratingObj = await AccountVideoRateModel.load(accountId, videoId, null)
+ const rating = ratingObj ? ratingObj.type : 'none'
+
+ const json: FormattedUserVideoRate = {
+ videoId,
+ rating
+ }
+ res.json(json)
}
-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))
- })
- .catch(err => next(err))
+async function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const resultList = await UserModel.listForApi(req.query.start, req.query.count, req.query.sort)
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
}
-function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) {
- 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)
- })
+async function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const user = await UserModel.loadById(req.params.id)
+
+ await user.destroy()
+
+ return res.sendStatus(204)
}
-function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function updateMe (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const body: UserUpdateMe = req.body
+
+ // FIXME: user is not already a Sequelize instance?
+ const user = res.locals.oauth.token.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
+ if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo
+
+ await user.save()
+
+ return res.sendStatus(204)
+}
+
+async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
const body: UserUpdate = req.body
+ const user = res.locals.user as UserModel
+
+ if (body.email !== undefined) user.email = body.email
+ if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota
+ if (body.role !== undefined) user.role = body.role
- db.User.loadByUsername(res.locals.oauth.token.user.username)
- .then(user => {
- if (body.password) user.password = body.password
- if (body.displayNSFW !== undefined) user.displayNSFW = body.displayNSFW
+ await user.save()
- return user.save()
- })
- .then(() => res.sendStatus(204))
- .catch(err => next(err))
+ return res.sendStatus(204)
}
function success (req: express.Request, res: express.Response, next: express.NextFunction) {
projects / github / Chocobozzz / PeerTube.git / blobdiff