X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=dcc4ef196b7444cef4f322deb7c8a8ef286e79f4;hb=6b738c7a31591a83fdcd9c78b6b1f98e543c378b;hp=05639fbecb5306e62ed0e4088bffaee38bdf78fd;hpb=ecb4e35f4e6c7304cb274593c13cb47fd5078b75;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index 05639fbec..dcc4ef196 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,34 +1,56 @@ import * as express from 'express' +import 'multer' import { extname, join } from 'path' -import * as sharp from 'sharp' import * as uuidv4 from 'uuid/v4' +import * as RateLimit from 'express-rate-limit' import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared' -import { unlinkPromise } from '../../helpers/core-utils' import { retryTransactionWrapper } from '../../helpers/database-utils' +import { processImage } from '../../helpers/image-utils' import { logger } from '../../helpers/logger' -import { createReqFiles, generateRandomString, getFormattedObjects } from '../../helpers/utils' -import { AVATAR_MIMETYPE_EXT, AVATARS_SIZE, CONFIG, sequelizeTypescript } from '../../initializers' +import { getFormattedObjects } from '../../helpers/utils' +import { AVATARS_SIZE, CONFIG, IMAGE_MIMETYPE_EXT, RATES_LIMIT, sequelizeTypescript } from '../../initializers' import { updateActorAvatarInstance } from '../../lib/activitypub' -import { sendUpdateUser } from '../../lib/activitypub/send' +import { sendUpdateActor } from '../../lib/activitypub/send' import { Emailer } from '../../lib/emailer' -import { EmailPayload } from '../../lib/job-queue/handlers/email' import { Redis } from '../../lib/redis' import { createUserAccountAndChannel } from '../../lib/user' import { - asyncMiddleware, authenticate, ensureUserHasRight, ensureUserRegistrationAllowed, paginationValidator, setDefaultSort, - setDefaultPagination, token, usersAddValidator, usersGetValidator, usersRegisterValidator, usersRemoveValidator, usersSortValidator, - usersUpdateMeValidator, usersUpdateValidator, usersVideoRatingValidator + asyncMiddleware, + authenticate, + ensureUserHasRight, + ensureUserRegistrationAllowed, + paginationValidator, + setDefaultPagination, + setDefaultSort, + token, + usersAddValidator, + usersGetValidator, + usersRegisterValidator, + usersRemoveValidator, + usersSortValidator, + usersUpdateMeValidator, + usersUpdateValidator, + usersVideoRatingValidator } from '../../middlewares' import { - usersAskResetPasswordValidator, usersResetPasswordValidator, usersUpdateMyAvatarValidator, + usersAskResetPasswordValidator, + usersResetPasswordValidator, + usersUpdateMyAvatarValidator, videosSortValidator } from '../../middlewares/validators' import { AccountVideoRateModel } from '../../models/account/account-video-rate' import { UserModel } from '../../models/account/user' import { OAuthTokenModel } from '../../models/oauth/oauth-token' import { VideoModel } from '../../models/video/video' +import { VideoSortField } from '../../../client/src/app/shared/video/sort-field.type' +import { createReqFiles } from '../../helpers/express-utils' -const reqAvatarFile = createReqFiles('avatarfile', CONFIG.STORAGE.AVATARS_DIR, AVATAR_MIMETYPE_EXT) +const reqAvatarFile = createReqFiles([ 'avatarfile' ], IMAGE_MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.AVATARS_DIR }) +const loginRateLimiter = new RateLimit({ + windowMs: RATES_LIMIT.LOGIN.WINDOW_MS, + max: RATES_LIMIT.LOGIN.MAX, + delayMs: 0 +}) const usersRouter = express.Router() @@ -68,6 +90,8 @@ usersRouter.get('/', ) usersRouter.get('/:id', + authenticate, + ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersGetValidator), getUser ) @@ -122,7 +146,11 @@ usersRouter.post('/:id/reset-password', asyncMiddleware(resetUserPassword) ) -usersRouter.post('/token', token, success) +usersRouter.post('/token', + loginRateLimiter, + token, + success +) // TODO: Once https://github.com/oauthjs/node-oauth2-server/pull/289 is merged, implement revoke token route // --------------------------------------------------------------------------- @@ -135,7 +163,13 @@ export { 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) + const resultList = await VideoModel.listAccountVideosForApi( + user.Account.id, + req.query.start as number, + req.query.count as number, + req.query.sort as VideoSortField, + false // Display my NSFW videos + ) return res.json(getFormattedObjects(resultList.data, resultList.total)) } @@ -151,7 +185,10 @@ async function createUserRetryWrapper (req: express.Request, res: express.Respon return res.json({ user: { id: user.id, - uuid: account.uuid + account: { + id: account.id, + uuid: account.Actor.uuid + } } }).end() } @@ -162,7 +199,7 @@ async function createUser (req: express.Request) { username: body.username, password: body.password, email: body.email, - displayNSFW: false, + nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, autoPlayVideo: true, role: body.role, videoQuota: body.videoQuota @@ -193,7 +230,7 @@ async function registerUser (req: express.Request) { username: body.username, password: body.password, email: body.email, - displayNSFW: false, + nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, autoPlayVideo: true, role: UserRole.USER, videoQuota: CONFIG.USER.VIDEO_QUOTA @@ -256,15 +293,21 @@ async function removeUser (req: express.Request, res: express.Response, next: ex async function updateMe (req: express.Request, res: express.Response, next: express.NextFunction) { const body: UserUpdateMe = req.body - const user = res.locals.oauth.token.user + const user: UserModel = 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 + if (body.nsfwPolicy !== undefined) user.nsfwPolicy = body.nsfwPolicy if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo - await user.save() - await sendUpdateUser(user, undefined) + await sequelizeTypescript.transaction(async t => { + await user.save({ transaction: t }) + + if (body.description !== undefined) user.Account.description = body.description + await user.Account.save({ transaction: t }) + + await sendUpdateActor(user.Account, t) + }) return res.sendStatus(204) } @@ -274,23 +317,16 @@ async function updateMyAvatar (req: express.Request, res: express.Response, next 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 destination = join(CONFIG.STORAGE.AVATARS_DIR, avatarName) + await processImage(avatarPhysicalFile, destination, AVATARS_SIZE) const avatar = await sequelizeTypescript.transaction(async t => { const updatedActor = await updateActorAvatarInstance(actor, avatarName, t) await updatedActor.save({ transaction: t }) - await sendUpdateUser(user, t) + await sendUpdateActor(user.Account, t) return updatedActor.Avatar })