X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers%2Fme.ts;h=a609abaa6a4762afc9643455dd86e611a50db08e;hb=8f608a4cb22ab232cfab20665050764b38bac9c7;hp=78e1e7fa3f4bcfbdea31a00c3cddca567c6ca238;hpb=d5c8932a601c1854db0a2e399ccaf26e17385f1a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index 78e1e7fa3..a609abaa6 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts @@ -1,9 +1,18 @@ -import * as express from 'express' import 'multer' -import { UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../../shared' +import * as express from 'express' +import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '@server/helpers/audit-logger' +import { Hooks } from '@server/lib/plugins/hooks' +import { ActorImageType, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../../shared' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' +import { UserVideoQuota } from '../../../../shared/models/users/user-video-quota.model' +import { createReqFiles } from '../../../helpers/express-utils' import { getFormattedObjects } from '../../../helpers/utils' +import { CONFIG } from '../../../initializers/config' import { MIMETYPES } from '../../../initializers/constants' +import { sequelizeTypescript } from '../../../initializers/database' import { sendUpdateActor } from '../../../lib/activitypub/send' +import { deleteLocalActorImageFile, updateLocalActorImageFile } from '../../../lib/actor-image' +import { getOriginalVideoFileTotalDailyFromUser, getOriginalVideoFileTotalFromUser, sendVerifyUserEmail } from '../../../lib/user' import { asyncMiddleware, asyncRetryTransactionMiddleware, @@ -11,23 +20,20 @@ import { paginationValidator, setDefaultPagination, setDefaultSort, + setDefaultVideosSort, usersUpdateMeValidator, usersVideoRatingValidator } from '../../../middlewares' import { deleteMeValidator, videoImportsSortValidator, videosSortValidator } from '../../../middlewares/validators' +import { updateAvatarValidator } from '../../../middlewares/validators/actor-image' +import { AccountModel } from '../../../models/account/account' import { AccountVideoRateModel } from '../../../models/account/account-video-rate' -import { UserModel } from '../../../models/account/user' +import { UserModel } from '../../../models/user/user' 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' -import { updateAvatarValidator } from '../../../middlewares/validators/avatar' -import { updateActorAvatarFile } from '../../../lib/avatar' import { VideoImportModel } from '../../../models/video/video-import' -import { AccountModel } from '../../../models/account/account' -import { CONFIG } from '../../../initializers/config' -import { sequelizeTypescript } from '../../../initializers/database' -import { sendVerifyUserEmail } from '../../../lib/user' +import { AttributesOnly } from '@shared/core-utils' + +const auditLogger = auditLoggerFactory('users') const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR }) @@ -39,7 +45,7 @@ meRouter.get('/me', ) meRouter.delete('/me', authenticate, - asyncMiddleware(deleteMeValidator), + deleteMeValidator, asyncMiddleware(deleteMe) ) @@ -61,7 +67,7 @@ meRouter.get('/me/videos', authenticate, paginationValidator, videosSortValidator, - setDefaultSort, + setDefaultVideosSort, setDefaultPagination, asyncMiddleware(getUserVideos) ) @@ -85,6 +91,11 @@ meRouter.post('/me/avatar/pick', asyncRetryTransactionMiddleware(updateMyAvatar) ) +meRouter.delete('/me/avatar', + authenticate, + asyncRetryTransactionMiddleware(deleteMyAvatar) +) + // --------------------------------------------------------------------------- export { @@ -95,11 +106,20 @@ export { async function getUserVideos (req: express.Request, res: express.Response) { const user = res.locals.oauth.token.User - const resultList = await VideoModel.listUserVideosForApi( - user.Account.id, - req.query.start as number, - req.query.count as number, - req.query.sort as VideoSortField + + const apiOptions = await Hooks.wrapObject({ + accountId: user.Account.id, + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + search: req.query.search, + isLive: req.query.isLive + }, 'filter:api.user.me.videos.list.params') + + const resultList = await Hooks.wrapPromiseFun( + VideoModel.listUserVideosForApi, + apiOptions, + 'filter:api.user.me.videos.list.result' ) const additionalAttributes = { @@ -125,16 +145,15 @@ async function getUserVideoImports (req: express.Request, res: express.Response) async function getUserInformation (req: express.Request, res: express.Response) { // We did not load channels in res.locals.user - const user = await UserModel.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username) + const user = await UserModel.loadForMeAPI(res.locals.oauth.token.user.id) - return res.json(user.toFormattedJSON({})) + return res.json(user.toMeFormattedJSON()) } async function getUserVideoQuotaUsed (req: express.Request, res: express.Response) { - // 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 videoQuotaUsedDaily = await UserModel.getOriginalVideoFileTotalDailyFromUser(user) + const user = res.locals.oauth.token.user + const videoQuotaUsed = await getOriginalVideoFileTotalFromUser(user) + const videoQuotaUsedDaily = await getOriginalVideoFileTotalDailyFromUser(user) const data: UserVideoQuota = { videoQuotaUsed, @@ -158,11 +177,13 @@ async function getUserVideoRating (req: express.Request, res: express.Response) } async function deleteMe (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User + const user = await UserModel.loadByIdWithChannels(res.locals.oauth.token.User.id) + + auditLogger.delete(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON())) await user.destroy() - return res.sendStatus(204) + return res.sendStatus(HttpStatusCode.NO_CONTENT_204) } async function updateMe (req: express.Request, res: express.Response) { @@ -171,13 +192,23 @@ async function updateMe (req: express.Request, res: express.Response) { const user = res.locals.oauth.token.user - if (body.password !== undefined) user.password = body.password - if (body.nsfwPolicy !== undefined) user.nsfwPolicy = body.nsfwPolicy - if (body.webTorrentEnabled !== undefined) user.webTorrentEnabled = body.webTorrentEnabled - if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo - if (body.videosHistoryEnabled !== undefined) user.videosHistoryEnabled = body.videosHistoryEnabled - if (body.videoLanguages !== undefined) user.videoLanguages = body.videoLanguages - if (body.theme !== undefined) user.theme = body.theme + const keysToUpdate: (keyof UserUpdateMe & keyof AttributesOnly)[] = [ + 'password', + 'nsfwPolicy', + 'webTorrentEnabled', + 'autoPlayVideo', + 'autoPlayNextVideo', + 'autoPlayNextVideoPlaylist', + 'videosHistoryEnabled', + 'videoLanguages', + 'theme', + 'noInstanceConfigWarningModal', + 'noWelcomeModal' + ] + + for (const key of keysToUpdate) { + if (body[key] !== undefined) user.set(key, body[key]) + } if (body.email !== undefined) { if (CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) { @@ -189,10 +220,12 @@ async function updateMe (req: express.Request, res: express.Response) { } await sequelizeTypescript.transaction(async t => { - const userAccount = await AccountModel.load(user.Account.id) - await user.save({ transaction: t }) + if (body.displayName === undefined && body.description === undefined) return + + const userAccount = await AccountModel.load(user.Account.id, t) + if (body.displayName !== undefined) userAccount.name = body.displayName if (body.description !== undefined) userAccount.description = body.description await userAccount.save({ transaction: t }) @@ -204,16 +237,25 @@ async function updateMe (req: express.Request, res: express.Response) { await sendVerifyUserEmail(user, true) } - return res.sendStatus(204) + return res.sendStatus(HttpStatusCode.NO_CONTENT_204) } async function updateMyAvatar (req: express.Request, res: express.Response) { - const avatarPhysicalFile = req.files[ 'avatarfile' ][ 0 ] + const avatarPhysicalFile = req.files['avatarfile'][0] const user = res.locals.oauth.token.user const userAccount = await AccountModel.load(user.Account.id) - const avatar = await updateActorAvatarFile(avatarPhysicalFile, userAccount) + const avatar = await updateLocalActorImageFile(userAccount, avatarPhysicalFile, ActorImageType.AVATAR) return res.json({ avatar: avatar.toFormattedJSON() }) } + +async function deleteMyAvatar (req: express.Request, res: express.Response) { + const user = res.locals.oauth.token.user + + const userAccount = await AccountModel.load(user.Account.id) + await deleteLocalActorImageFile(userAccount, ActorImageType.AVATAR) + + return res.sendStatus(HttpStatusCode.NO_CONTENT_204) +}