import * as express from 'express'
-
-import { database as db } from '../../initializers/database'
-import { USER_ROLES, CONFIG } from '../../initializers'
-import { logger, getFormattedObjects, retryTransactionWrapper } 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,
- usersRegisterValidator,
- usersUpdateValidator,
- usersUpdateMeValidator,
- usersRemoveValidator,
- usersVideoRatingValidator,
- usersGetValidator,
paginationValidator,
setPagination,
- usersSortValidator,
setUsersSort,
+ setVideosSort,
token,
- asyncMiddleware
+ usersAddValidator,
+ usersGetValidator,
+ usersRegisterValidator,
+ usersRemoveValidator,
+ usersSortValidator,
+ usersUpdateMeValidator,
+ usersUpdateValidator,
+ usersVideoRatingValidator
} from '../../middlewares'
-import {
- UserVideoRate as FormattedUserVideoRate,
- UserCreate,
- UserUpdate,
- UserUpdateMe
-} from '../../../shared'
-import { createUserAuthorAndChannel } from '../../lib'
-import { UserInstance } from '../../models'
+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()
asyncMiddleware(getUserInformation)
)
+usersRouter.get('/me/videos',
+ authenticate,
+ paginationValidator,
+ videosSortValidator,
+ setVideosSort,
+ setPagination,
+ asyncMiddleware(getUserVideos)
+)
+
usersRouter.get('/me/videos/:videoId/rating',
authenticate,
- usersVideoRatingValidator,
+ asyncMiddleware(usersVideoRatingValidator),
asyncMiddleware(getUserVideoRating)
)
usersRouter.get('/',
+ authenticate,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
paginationValidator,
usersSortValidator,
setUsersSort,
)
usersRouter.get('/:id',
- usersGetValidator,
+ asyncMiddleware(usersGetValidator),
getUser
)
usersRouter.post('/',
authenticate,
- ensureIsAdmin,
- usersAddValidator,
- createUserRetryWrapper
+ ensureUserHasRight(UserRight.MANAGE_USERS),
+ asyncMiddleware(usersAddValidator),
+ asyncMiddleware(createUserRetryWrapper)
)
usersRouter.post('/register',
- ensureUserRegistrationAllowed,
- usersRegisterValidator,
- asyncMiddleware(registerUser)
+ asyncMiddleware(ensureUserRegistrationAllowed),
+ asyncMiddleware(usersRegisterValidator),
+ asyncMiddleware(registerUserRetryWrapper)
)
usersRouter.put('/me',
usersRouter.put('/:id',
authenticate,
- ensureIsAdmin,
- usersUpdateValidator,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
+ asyncMiddleware(usersUpdateValidator),
asyncMiddleware(updateUser)
)
usersRouter.delete('/:id',
authenticate,
- ensureIsAdmin,
- usersRemoveValidator,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
+ asyncMiddleware(usersRemoveValidator),
asyncMiddleware(removeUser)
)
// ---------------------------------------------------------------------------
+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, res ],
+ arguments: [ req ],
errorMessage: 'Cannot insert the user with many retries.'
}
return res.type('json').status(204).end()
}
-async function createUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function createUser (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: body.role,
videoQuota: body.videoQuota
})
- await createUserAuthorAndChannel(user)
+ await createUserAccountAndChannel(user)
- logger.info('User %s with its channel and author created.', body.username)
+ logger.info('User %s with its channel and account created.', body.username)
}
-async function registerUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+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
})
- await createUserAuthorAndChannel(user)
- return res.type('json').status(204).end()
+ await createUserAccountAndChannel(user)
+
+ logger.info('User %s with its channel and account registered.', body.username)
}
async function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
- const user = await db.User.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username)
+ // 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())
}
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
+ const accountId = +res.locals.oauth.token.User.Account.id
- const ratingObj = await db.UserVideoRate.load(userId, videoId, null)
+ const ratingObj = await AccountVideoRateModel.load(accountId, videoId, null)
const rating = ratingObj ? ratingObj.type : 'none'
const json: FormattedUserVideoRate = {
}
async function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.User.listForApi(req.query.start, req.query.count, req.query.sort)
+ const resultList = await UserModel.listForApi(req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) {
- const user = await db.User.loadById(req.params.id)
+ const user = await UserModel.loadById(req.params.id)
await user.destroy()
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()
async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
const body: UserUpdate = req.body
- const user: UserInstance = res.locals.user
+ 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
await user.save()
projects / github / Chocobozzz / PeerTube.git / blobdiff