X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=89105691267786772d361956f22e92acbff9d327;hb=0c237b19fdf9c614293c1442f0ab95a81ce05735;hp=57b98b84ad0b7022e45f2a55746bae71135cc646;hpb=c5911fd347c76e8bdc05ea9f3ee9efed4a58c236;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index 57b98b84a..891056912 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,25 +1,58 @@ import * as express from 'express' +import 'multer' import { extname, join } from 'path' 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 { renamePromise } from '../../helpers/core-utils' -import { retryTransactionWrapper } from '../../helpers/database-utils' +import { processImage } from '../../helpers/image-utils' import { logger } from '../../helpers/logger' -import { createReqFiles, getFormattedObjects } from '../../helpers/utils' -import { AVATAR_MIMETYPE_EXT, 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 { sendUpdateActor } from '../../lib/activitypub/send' +import { Emailer } from '../../lib/emailer' +import { Redis } from '../../lib/redis' import { createUserAccountAndChannel } from '../../lib/user' import { - asyncMiddleware, authenticate, ensureUserHasRight, ensureUserRegistrationAllowed, paginationValidator, setPagination, setUsersSort, - setVideosSort, token, usersAddValidator, usersGetValidator, usersRegisterValidator, usersRemoveValidator, usersSortValidator, - usersUpdateMeValidator, usersUpdateValidator, usersVideoRatingValidator + asyncMiddleware, + asyncRetryTransactionMiddleware, + authenticate, + ensureUserHasRight, + ensureUserRegistrationAllowed, + ensureUserRegistrationAllowedForIP, + paginationValidator, + setDefaultPagination, + setDefaultSort, + token, + usersAddValidator, + usersGetValidator, + usersRegisterValidator, + usersRemoveValidator, + usersSortValidator, + usersUpdateMeValidator, + usersUpdateValidator, + usersVideoRatingValidator } from '../../middlewares' -import { usersUpdateMyAvatarValidator, videosSortValidator } from '../../middlewares/validators' +import { + usersAskResetPasswordValidator, + usersResetPasswordValidator, + 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 { 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' +import { UserVideoQuota } from '../../../shared/models/users/user-video-quota.model' -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() @@ -28,12 +61,17 @@ usersRouter.get('/me', asyncMiddleware(getUserInformation) ) +usersRouter.get('/me/video-quota-used', + authenticate, + asyncMiddleware(getUserVideoQuotaUsed) +) + usersRouter.get('/me/videos', authenticate, paginationValidator, videosSortValidator, - setVideosSort, - setPagination, + setDefaultSort, + setDefaultPagination, asyncMiddleware(getUserVideos) ) @@ -48,12 +86,14 @@ usersRouter.get('/', ensureUserHasRight(UserRight.MANAGE_USERS), paginationValidator, usersSortValidator, - setUsersSort, - setPagination, + setDefaultSort, + setDefaultPagination, asyncMiddleware(listUsers) ) usersRouter.get('/:id', + authenticate, + ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersGetValidator), getUser ) @@ -62,13 +102,14 @@ usersRouter.post('/', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersAddValidator), - asyncMiddleware(createUserRetryWrapper) + asyncRetryTransactionMiddleware(createUser) ) usersRouter.post('/register', asyncMiddleware(ensureUserRegistrationAllowed), + ensureUserRegistrationAllowedForIP, asyncMiddleware(usersRegisterValidator), - asyncMiddleware(registerUserRetryWrapper) + asyncRetryTransactionMiddleware(registerUser) ) usersRouter.put('/me', @@ -98,7 +139,21 @@ usersRouter.delete('/:id', asyncMiddleware(removeUser) ) -usersRouter.post('/token', token, success) +usersRouter.post('/ask-reset-password', + asyncMiddleware(usersAskResetPasswordValidator), + asyncMiddleware(askResetUserPassword) +) + +usersRouter.post('/:id/reset-password', + asyncMiddleware(usersResetPasswordValidator), + asyncMiddleware(resetUserPassword) +) + +usersRouter.post('/token', + loginRateLimiter, + token, + success +) // TODO: Once https://github.com/oauthjs/node-oauth2-server/pull/289 is merged, implement revoke token route // --------------------------------------------------------------------------- @@ -111,59 +166,57 @@ 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) - - 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.' + const resultList = await VideoModel.listUserVideosForApi( + user.Account.id, + req.query.start as number, + req.query.count as number, + req.query.sort as VideoSortField, + false // Display my NSFW videos + ) + + const additionalAttributes = { + waitTranscoding: true, + state: true, + scheduledUpdate: true } - - await retryTransactionWrapper(createUser, options) - - // TODO : include Location of the new user -> 201 - return res.type('json').status(204).end() + return res.json(getFormattedObjects(resultList.data, resultList.total, { additionalAttributes })) } -async function createUser (req: express.Request) { +async function createUser (req: express.Request, res: express.Response) { const body: UserCreate = req.body - const user = new UserModel({ + const userToCreate = new UserModel({ 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 }) - await createUserAccountAndChannel(user) + const { user, account } = await createUserAccountAndChannel(userToCreate) logger.info('User %s with its channel and account created.', body.username) -} - -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() + return res.json({ + user: { + id: user.id, + account: { + id: account.id, + uuid: account.Actor.uuid + } + } + }).end() } -async function registerUser (req: express.Request) { +async function registerUser (req: express.Request, res: express.Response) { const body: UserCreate = req.body const user = new UserModel({ 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 @@ -172,6 +225,8 @@ async function registerUser (req: express.Request) { await createUserAccountAndChannel(user) logger.info('User %s with its channel and account registered.', body.username) + + return res.type('json').status(204).end() } async function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) { @@ -181,8 +236,19 @@ async function getUserInformation (req: express.Request, res: express.Response, return res.json(user.toFormattedJSON()) } +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 data: UserVideoQuota = { + videoQuotaUsed + } + return res.json(data) +} + function getUser (req: express.Request, res: express.Response, next: express.NextFunction) { - return res.json(res.locals.user.toFormattedJSON()) + return res.json((res.locals.user as UserModel).toFormattedJSON()) } async function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) { @@ -216,44 +282,43 @@ 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 - // FIXME: user is not already a Sequelize instance? - 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 sequelizeTypescript.transaction(async t => { + await user.save({ transaction: t }) + + if (body.displayName !== undefined) user.Account.name = body.displayName + if (body.description !== undefined) user.Account.description = body.description + await user.Account.save({ transaction: t }) + + await sendUpdateActor(user.Account, t) + }) 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 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) + const destination = join(CONFIG.STORAGE.AVATARS_DIR, avatarName) + await processImage(avatarPhysicalFile, destination, AVATARS_SIZE) - await renamePromise(source, destination) + const avatar = await sequelizeTypescript.transaction(async t => { + const updatedActor = await updateActorAvatarInstance(actor, avatarName, t) + await updatedActor.save({ transaction: t }) - 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 }) - } + await sendUpdateActor(user.Account, t) - actor.set('avatarId', avatar.id) - await actor.save({ transaction: t }) - - return { actor, avatar } + return updatedActor.Avatar }) return res @@ -266,6 +331,7 @@ async function updateMyAvatar (req: express.Request, res: express.Response, next async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) { const body: UserUpdate = req.body const user = res.locals.user as UserModel + const roleChanged = body.role !== undefined && body.role !== user.role if (body.email !== undefined) user.email = body.email if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota @@ -273,9 +339,35 @@ async function updateUser (req: express.Request, res: express.Response, next: ex await user.save() + // Destroy user token to refresh rights + if (roleChanged) { + await OAuthTokenModel.deleteUserToken(user.id) + } + + // Don't need to send this update to followers, these attributes are not propagated + return res.sendStatus(204) } +async function askResetUserPassword (req: express.Request, res: express.Response, next: express.NextFunction) { + const user = res.locals.user as UserModel + + const verificationString = await Redis.Instance.setResetPasswordVerificationString(user.id) + const url = CONFIG.WEBSERVER.URL + '/reset-password?userId=' + user.id + '&verificationString=' + verificationString + await Emailer.Instance.addForgetPasswordEmailJob(user.email, url) + + return res.status(204).end() +} + +async function resetUserPassword (req: express.Request, res: express.Response, next: express.NextFunction) { + const user = res.locals.user as UserModel + user.password = req.body.password + + await user.save() + + return res.status(204).end() +} + function success (req: express.Request, res: express.Response, next: express.NextFunction) { res.end() }