X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=6c24434f2f588a15949c4b328fbbb1ef97c704dd;hb=e8e122002d5a6a2bedcf3d66d35657c9b9e1ebaf;hp=dcd407fdf49b298cd6134a9878a6518196079544;hpb=fd45e8f43c2638478599ca75632518054461da85;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index dcd407fdf..6c24434f2 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,37 +1,26 @@ import * as express from 'express' - -import { database as db, CONFIG } from '../../initializers' -import { logger, getFormattedObjects, retryTransactionWrapper } 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 { renamePromise, 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 { createUserAccountAndChannel } from '../../lib/user' import { - authenticate, - ensureUserHasRight, - ensureUserRegistrationAllowed, - usersAddValidator, - usersRegisterValidator, - usersUpdateValidator, - usersUpdateMeValidator, - usersRemoveValidator, - usersVideoRatingValidator, - usersGetValidator, - paginationValidator, - setPagination, - usersSortValidator, - setUsersSort, - token, - asyncMiddleware + asyncMiddleware, authenticate, ensureUserHasRight, ensureUserRegistrationAllowed, paginationValidator, setPagination, setUsersSort, + setVideosSort, token, usersAddValidator, usersGetValidator, usersRegisterValidator, usersRemoveValidator, usersSortValidator, + usersUpdateMeValidator, usersUpdateValidator, usersVideoRatingValidator } from '../../middlewares' -import { - UserVideoRate as FormattedUserVideoRate, - UserCreate, - UserUpdate, - UserUpdateMe, - UserRole, - UserRight -} from '../../../shared' -import { createUserAuthorAndChannel } from '../../lib' -import { UserInstance } from '../../models' -import { videosSortValidator } from '../../middlewares/validators/sort' -import { setVideosSort } from '../../middlewares/sort' +import { usersUpdateMyAvatarValidator, videosSortValidator } from '../../middlewares/validators' +import { AccountVideoRateModel } from '../../models/account/account-video-rate' +import { UserModel } from '../../models/account/user' +import { AvatarModel } from '../../models/avatar/avatar' +import { VideoModel } from '../../models/video/video' + +const reqAvatarFile = createReqFiles('avatarfile', CONFIG.STORAGE.AVATARS_DIR, AVATAR_MIMETYPE_EXT) const usersRouter = express.Router() @@ -51,11 +40,13 @@ usersRouter.get('/me/videos', usersRouter.get('/me/videos/:videoId/rating', authenticate, - usersVideoRatingValidator, + asyncMiddleware(usersVideoRatingValidator), asyncMiddleware(getUserVideoRating) ) usersRouter.get('/', + authenticate, + ensureUserHasRight(UserRight.MANAGE_USERS), paginationValidator, usersSortValidator, setUsersSort, @@ -64,21 +55,21 @@ usersRouter.get('/', ) usersRouter.get('/:id', - usersGetValidator, + asyncMiddleware(usersGetValidator), getUser ) usersRouter.post('/', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), - usersAddValidator, - createUserRetryWrapper + asyncMiddleware(usersAddValidator), + asyncMiddleware(createUserRetryWrapper) ) usersRouter.post('/register', - ensureUserRegistrationAllowed, - usersRegisterValidator, - asyncMiddleware(registerUser) + asyncMiddleware(ensureUserRegistrationAllowed), + asyncMiddleware(usersRegisterValidator), + asyncMiddleware(registerUserRetryWrapper) ) usersRouter.put('/me', @@ -87,17 +78,24 @@ usersRouter.put('/me', asyncMiddleware(updateMe) ) +usersRouter.post('/me/avatar/pick', + authenticate, + reqAvatarFile, + usersUpdateMyAvatarValidator, + asyncMiddleware(updateMyAvatar) +) + usersRouter.put('/:id', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), - usersUpdateValidator, + asyncMiddleware(usersUpdateValidator), asyncMiddleware(updateUser) ) usersRouter.delete('/:id', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), - usersRemoveValidator, + asyncMiddleware(usersRemoveValidator), asyncMiddleware(removeUser) ) @@ -113,15 +111,15 @@ export { // --------------------------------------------------------------------------- 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) + 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.' } @@ -131,54 +129,68 @@ async function createUserRetryWrapper (req: express.Request, res: express.Respon 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, + 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, + 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) { // We did not load channels in res.locals.user - const user = await db.User.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username) + const user = await UserModel.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.oauth.token.User.toFormattedJSON()) + return res.json(res.locals.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 = { @@ -189,13 +201,13 @@ async function getUserVideoRating (req: express.Request, res: express.Response, } 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() @@ -211,15 +223,54 @@ async function updateMe (req: express.Request, res: express.Response, next: expr 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() return res.sendStatus(204) } +async function updateMyAvatar (req: express.Request, res: express.Response, next: express.NextFunction) { + const avatarPhysicalFile = req.files['avatarfile'][0] + const actor = res.locals.oauth.token.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 avatar = await AvatarModel.create({ + filename: avatarName + }, { transaction: t }) + + if (actor.Avatar) { + await actor.Avatar.destroy({ transaction: t }) + } + + actor.set('avatarId', avatar.id) + await actor.save({ transaction: t }) + + return { actor, 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: 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