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, database as db } from '../../initializers'
+import { createUserAccountAndChannel } from '../../lib'
import {
+ asyncMiddleware,
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight,
ensureUserRegistrationAllowed,
- usersAddValidator,
- usersRegisterValidator,
- usersUpdateValidator,
- usersUpdateMeValidator,
- usersRemoveValidator,
- usersVideoRatingValidator,
- usersGetValidator,
paginationValidator,
setPagination,
- usersSortValidator,
setUsersSort,
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 { setVideosSort } from '../../middlewares/sort'
+import { videosSortValidator } from '../../middlewares/validators/sort'
import { UserInstance } from '../../models'
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,
usersRouter.post('/',
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
usersAddValidator,
createUserRetryWrapper
)
usersRouter.put('/:id',
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
usersUpdateValidator,
asyncMiddleware(updateUser)
)
usersRouter.delete('/:id',
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
usersRemoveValidator,
asyncMiddleware(removeUser)
)
// ---------------------------------------------------------------------------
+async function getUserVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const user = res.locals.oauth.token.User
+ const resultList = await db.Video.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 ],
password: body.password,
email: body.email,
displayNSFW: false,
- role: USER_ROLES.USER,
+ 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) {
password: body.password,
email: body.email,
displayNSFW: false,
- role: USER_ROLES.USER,
+ role: UserRole.USER,
videoQuota: CONFIG.USER.VIDEO_QUOTA
})
- await createUserAuthorAndChannel(user)
+ await createUserAccountAndChannel(user)
return res.type('json').status(204).end()
}
async function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
+ // We did not load channels in res.locals.user
const user = await db.User.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
-
- 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))
+ const accountId = +res.locals.oauth.token.User.Account.id
+
+ const ratingObj = await db.AccountVideoRate.load(accountId, videoId, null)
+ const rating = ratingObj ? ratingObj.type : 'none'
+
+ const json: FormattedUserVideoRate = {
+ videoId,
+ rating
+ }
+ res.json(json)
}
async function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
await user.save()
- return await res.sendStatus(204)
+ return res.sendStatus(204)
}
async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
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()