X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=ac7c87517d8d0e9458f4c450edacba9d9aa433db;hb=40ff57078e15d5b86ee6b71e198b95d3feb78eaf;hp=ffe5881e5594040e6a5cb9f99fcaf84cee6e59bd;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index ffe5881e5..ac7c87517 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,34 +1,50 @@ import * as express from 'express' -import { waterfall } from 'async' - -import { database as db } from '../../initializers/database' -import { CONFIG, 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, database as db } from '../../initializers' +import { createUserAccountAndChannel } from '../../lib' import { + asyncMiddleware, authenticate, - ensureIsAdmin, - usersAddValidator, - usersUpdateValidator, - usersRemoveValidator, - usersVideoRatingValidator, + ensureUserHasRight, + ensureUserRegistrationAllowed, paginationValidator, setPagination, - usersSortValidator, setUsersSort, - token + token, + usersAddValidator, + usersGetValidator, + usersRegisterValidator, + usersRemoveValidator, + usersSortValidator, + usersUpdateMeValidator, + usersUpdateValidator, + usersVideoRatingValidator } from '../../middlewares' +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('/', @@ -36,33 +52,45 @@ usersRouter.get('/', usersSortValidator, setUsersSort, setPagination, - listUsers + asyncMiddleware(listUsers) +) + +usersRouter.get('/:id', + usersGetValidator, + getUser ) usersRouter.post('/', authenticate, - ensureIsAdmin, + ensureUserHasRight(UserRight.MANAGE_USERS), usersAddValidator, - createUser + createUserRetryWrapper ) usersRouter.post('/register', - ensureRegistrationEnabled, - usersAddValidator, - createUser + ensureUserRegistrationAllowed, + usersRegisterValidator, + asyncMiddleware(registerUserRetryWrapper) +) + +usersRouter.put('/me', + authenticate, + usersUpdateMeValidator, + asyncMiddleware(updateMe) ) usersRouter.put('/:id', authenticate, + 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) @@ -76,96 +104,134 @@ export { // --------------------------------------------------------------------------- -function ensureRegistrationEnabled (req: express.Request, res: express.Response, next: express.NextFunction) { - const registrationEnabled = CONFIG.SIGNUP.ENABLED +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)) +} - if (registrationEnabled === true) { - return next() +async function createUserRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { + const options = { + arguments: [ req ], + errorMessage: 'Cannot insert the user with many retries.' } - return res.status(400).send('User registration is not enabled.') + await retryTransactionWrapper(createUser, options) + + // TODO : include Location of the new user -> 201 + return res.type('json').status(204).end() } -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({ - 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: body.role, + videoQuota: body.videoQuota }) - user.save().asCallback(function (err) { - if (err) return next(err) + await createUserAccountAndChannel(user) - return res.type('json').status(204).end() - }) + logger.info('User %s with its channel and account created.', body.username) } -function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) { - db.User.loadByUsername(res.locals.oauth.token.user.username, function (err, user) { - if (err) return next(err) +async function registerUserRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { + const options = { + arguments: [ req ], + errorMessage: 'Cannot insert the user with many retries.' + } - return res.json(user.toFormatedJSON()) + 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({ + username: body.username, + password: body.password, + email: body.email, + displayNSFW: false, + role: UserRole.USER, + videoQuota: CONFIG.USER.VIDEO_QUOTA }) + + 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) { + // 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 getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoId = '' + req.params.videoId - const userId = +res.locals.oauth.token.User.id +function getUser (req: express.Request, res: express.Response, next: express.NextFunction) { + return res.json(res.locals.user.toFormattedJSON()) +} - db.UserVideoRate.load(userId, videoId, null, function (err, ratingObj) { - if (err) return next(err) +async function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) { + const videoId = +req.params.videoId + const accountId = +res.locals.oauth.token.User.Account.id - const rating = ratingObj ? ratingObj.type : 'none' + const ratingObj = await db.AccountVideoRate.load(accountId, videoId, null) + const rating = ratingObj ? ratingObj.type : 'none' - res.json({ - videoId, - rating - }) - }) + 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, function (err, usersList, usersTotal) { - if (err) return 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) - res.json(getFormatedObjects(usersList, usersTotal)) - }) + return res.json(getFormattedObjects(resultList.data, resultList.total)) } -function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) { - waterfall([ - function loadUser (callback) { - db.User.loadById(req.params.id, callback) - }, - - function deleteUser (user, callback) { - user.destroy().asCallback(callback) - } - ], function andFinally (err) { - if (err) { - logger.error('Errors when removed the user.', { error: err }) - return next(err) - } - - return res.sendStatus(204) - }) +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 updateUser (req: express.Request, res: express.Response, next: express.NextFunction) { - db.User.loadByUsername(res.locals.oauth.token.user.username, function (err, user) { - if (err) return next(err) +async function updateMe (req: express.Request, res: express.Response, next: express.NextFunction) { + const body: UserUpdateMe = req.body - if (req.body.password) user.password = req.body.password - if (req.body.displayNSFW !== undefined) user.displayNSFW = req.body.displayNSFW + // FIXME: user is not already a Sequelize instance? + const user = res.locals.oauth.token.user - user.save().asCallback(function (err) { - if (err) return next(err) + 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 res.sendStatus(204) - }) - }) + 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: 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 res.sendStatus(204) } function success (req: express.Request, res: express.Response, next: express.NextFunction) {