X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=0ca9b337a0c83c2bce6be6cedca85e5a5d84c23c;hb=1174a8479ab9ee47b3305d668fe757435057a298;hp=ce15353eff73e6232b5773920ccdeda8d5d0ef01;hpb=ba44fa19531186944fef3e9da34f5e91f0c0dedb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index ce15353ef..0ca9b337a 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,70 +1,108 @@ 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 { extname, join } from 'path' +import * as sharp from 'sharp' +import * as uuidv4 from 'uuid/v4' +import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared' +import { unlinkPromise } from '../../helpers/core-utils' +import { retryTransactionWrapper } from '../../helpers/database-utils' +import { logger } from '../../helpers/logger' +import { createReqFiles, getFormattedObjects } from '../../helpers/utils' +import { AVATAR_MIMETYPE_EXT, AVATARS_SIZE, CONFIG, sequelizeTypescript } from '../../initializers' +import { updateActorAvatarInstance } from '../../lib/activitypub' +import { sendUpdateUser } from '../../lib/activitypub/send' +import { createUserAccountAndChannel } from '../../lib/user' import { - authenticate, - ensureIsAdmin, - ensureUserRegistrationEnabled, - usersAddValidator, - usersUpdateValidator, - usersRemoveValidator, - usersVideoRatingValidator, - paginationValidator, - setPagination, - usersSortValidator, - setUsersSort, - token + asyncMiddleware, authenticate, ensureUserHasRight, ensureUserRegistrationAllowed, paginationValidator, setDefaultSort, + setPagination, token, usersAddValidator, usersGetValidator, usersRegisterValidator, usersRemoveValidator, usersSortValidator, + usersUpdateMeValidator, usersUpdateValidator, usersVideoRatingValidator } from '../../middlewares' -import { UserVideoRate as FormatedUserVideoRate } from '../../../shared' +import { usersUpdateMyAvatarValidator, 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 reqAvatarFile = createReqFiles('avatarfile', CONFIG.STORAGE.AVATARS_DIR, AVATAR_MIMETYPE_EXT) const usersRouter = express.Router() usersRouter.get('/me', authenticate, - getUserInformation + asyncMiddleware(getUserInformation) +) + +usersRouter.get('/me/video-quota-used', + authenticate, + asyncMiddleware(getUserVideoQuotaUsed) +) + +usersRouter.get('/me/videos', + authenticate, + paginationValidator, + videosSortValidator, + setDefaultSort, + 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, + setDefaultSort, 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', - ensureUserRegistrationEnabled, - usersAddValidator, - createUser + asyncMiddleware(ensureUserRegistrationAllowed), + asyncMiddleware(usersRegisterValidator), + asyncMiddleware(registerUserRetryWrapper) +) + +usersRouter.put('/me', + authenticate, + usersUpdateMeValidator, + asyncMiddleware(updateMe) +) + +usersRouter.post('/me/avatar/pick', + authenticate, + reqAvatarFile, + usersUpdateMyAvatarValidator, + asyncMiddleware(updateMyAvatar) ) 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) @@ -78,87 +116,182 @@ export { // --------------------------------------------------------------------------- -function createUser (req: express.Request, res: express.Response, next: express.NextFunction) { - const user = db.User.build({ - username: req.body.username, - password: req.body.password, - email: req.body.email, +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, - role: USER_ROLES.USER + autoPlayVideo: true, + 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 = new UserModel({ + username: body.username, + password: body.password, + email: body.email, + displayNSFW: false, + autoPlayVideo: true, + role: UserRole.USER, + videoQuota: CONFIG.USER.VIDEO_QUOTA }) + + await createUserAccountAndChannel(user) + + logger.info('User %s with its channel and account registered.', body.username) } -function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoId = '' + req.params.videoId - const userId = +res.locals.oauth.token.User.id +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) - db.UserVideoRate.load(userId, videoId, null, function (err, ratingObj) { - if (err) return next(err) + return res.json(user.toFormattedJSON()) +} - const rating = ratingObj ? ratingObj.type : 'none' +async function getUserVideoQuotaUsed (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) + const videoQuotaUsed = await UserModel.getOriginalVideoFileTotalFromUser(user) - const json: FormatedUserVideoRate = { - videoId, - rating - } - res.json(json) + return res.json({ + videoQuotaUsed }) } -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) +function getUser (req: express.Request, res: express.Response, next: express.NextFunction) { + return res.json((res.locals.user as UserModel).toFormattedJSON()) +} - res.json(getFormatedObjects(usersList, usersTotal)) - }) +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 ratingObj = await AccountVideoRateModel.load(accountId, videoId, null) + const rating = ratingObj ? ratingObj.type : 'none' + + const json: FormattedUserVideoRate = { + videoId, + rating + } + res.json(json) } -function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) { - waterfall([ - function loadUser (callback) { - db.User.loadById(req.params.id, callback) - }, +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) - 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.json(getFormattedObjects(resultList.data, resultList.total)) +} - return res.sendStatus(204) - }) +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) { - 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 + 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 + if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo - return res.sendStatus(204) - }) + await user.save() + await sendUpdateUser(user, undefined) + + return res.sendStatus(204) +} + +async function updateMyAvatar (req: express.Request, res: express.Response, next: express.NextFunction) { + const avatarPhysicalFile = req.files['avatarfile'][0] + const user = res.locals.oauth.token.user + const actor = user.Account.Actor + + const avatarDir = CONFIG.STORAGE.AVATARS_DIR + const source = join(avatarDir, avatarPhysicalFile.filename) + const extension = extname(avatarPhysicalFile.filename) + const avatarName = uuidv4() + extension + const destination = join(avatarDir, avatarName) + + await sharp(source) + .resize(AVATARS_SIZE.width, AVATARS_SIZE.height) + .toFile(destination) + + await unlinkPromise(source) + + const avatar = await sequelizeTypescript.transaction(async t => { + const updatedActor = await updateActorAvatarInstance(actor, avatarName, t) + await updatedActor.save({ transaction: t }) + + await sendUpdateUser(user, t) + + return updatedActor.Avatar }) + + return res + .json({ + avatar: avatar.toFormattedJSON() + }) + .end() +} + +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 + + await user.save() + + // Don't need to send this update to followers, these attributes are not propagated + + return res.sendStatus(204) } function success (req: express.Request, res: express.Response, next: express.NextFunction) {