X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=ac7c87517d8d0e9458f4c450edacba9d9aa433db;hb=40ff57078e15d5b86ee6b71e198b95d3feb78eaf;hp=1ecaaf93f7a04c60dd0180b46be92933dab0f891;hpb=77a5501f6413aff2f2a626b929dfda486fa9a3e6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index 1ecaaf93f..ac7c87517 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,44 +1,50 @@ import * as express from 'express' - -import { database as db } from '../../initializers/database' -import { USER_ROLES, CONFIG } from '../../initializers' -import { logger, getFormattedObjects } 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, + paginationValidator, + setPagination, + setUsersSort, + token, usersAddValidator, + usersGetValidator, usersRegisterValidator, - usersUpdateValidator, - usersUpdateMeValidator, usersRemoveValidator, - usersVideoRatingValidator, - usersGetValidator, - paginationValidator, - setPagination, usersSortValidator, - setUsersSort, - token + usersUpdateMeValidator, + usersUpdateValidator, + usersVideoRatingValidator } from '../../middlewares' -import { - UserVideoRate as FormattedUserVideoRate, - UserCreate, - UserUpdate, - UserUpdateMe -} from '../../../shared' +import { setVideosSort } from '../../middlewares/sort' +import { videosSortValidator } from '../../middlewares/validators/sort' import { UserInstance } from '../../models' 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(getUserVideoRating) ) usersRouter.get('/', @@ -46,7 +52,7 @@ usersRouter.get('/', usersSortValidator, setUsersSort, setPagination, - listUsers + asyncMiddleware(listUsers) ) usersRouter.get('/:id', @@ -56,35 +62,35 @@ usersRouter.get('/:id', usersRouter.post('/', authenticate, - ensureIsAdmin, + ensureUserHasRight(UserRight.MANAGE_USERS), usersAddValidator, - createUser + createUserRetryWrapper ) usersRouter.post('/register', ensureUserRegistrationAllowed, usersRegisterValidator, - registerUser + asyncMiddleware(registerUserRetryWrapper) ) usersRouter.put('/me', authenticate, usersUpdateMeValidator, - updateMe + asyncMiddleware(updateMe) ) usersRouter.put('/:id', authenticate, - ensureIsAdmin, + ensureUserHasRight(UserRight.MANAGE_USERS), usersUpdateValidator, - updateUser + asyncMiddleware(updateUser) ) usersRouter.delete('/:id', authenticate, - ensureIsAdmin, + ensureUserHasRight(UserRight.MANAGE_USERS), usersRemoveValidator, - removeUser + asyncMiddleware(removeUser) ) usersRouter.post('/token', token, success) @@ -98,24 +104,53 @@ export { // --------------------------------------------------------------------------- -function createUser (req: express.Request, res: express.Response, next: express.NextFunction) { - const body: UserCreate = req.body +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 ], + 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 = db.User.build({ username: body.username, password: body.password, email: body.email, displayNSFW: false, - role: USER_ROLES.USER, + role: body.role, videoQuota: body.videoQuota }) - 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 created.', body.username) } -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({ @@ -123,85 +158,80 @@ function registerUser (req: express.Request, res: express.Response, next: expres password: body.password, email: body.email, displayNSFW: false, - role: USER_ROLES.USER, + 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.toFormattedJSON())) - .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 db.User.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: 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) } -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(getFormattedObjects(resultList.data, resultList.total)) - }) - .catch(err => next(err)) +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) + + 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 db.User.loadById(req.params.id) + + await user.destroy() + + return res.sendStatus(204) } -function updateMe (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? - 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)) + 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 + + await user.save() + + return res.sendStatus(204) } -function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) { +async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) { const body: UserUpdate = req.body const user: UserInstance = res.locals.user 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() - 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) {