-import * as express from 'express'
import 'multer'
-import { UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../../shared'
+import express from 'express'
+import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '@server/helpers/audit-logger'
+import { getBiggestActorImage } from '@server/lib/actor-image'
+import { Hooks } from '@server/lib/plugins/hooks'
+import { pick } from '@shared/core-utils'
+import { ActorImageType, HttpStatusCode, UserUpdateMe, UserVideoQuota, UserVideoRate as FormattedUserVideoRate } from '@shared/models'
+import { AttributesOnly } from '@shared/typescript-utils'
+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, updateLocalActorImageFiles } from '../../../lib/local-actor'
+import { getOriginalVideoFileTotalDailyFromUser, getOriginalVideoFileTotalFromUser, sendVerifyUserEmail } from '../../../lib/user'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
paginationValidator,
setDefaultPagination,
setDefaultSort,
+ setDefaultVideosSort,
usersUpdateMeValidator,
usersVideoRatingValidator
} from '../../../middlewares'
-import { deleteMeValidator, videoImportsSortValidator, videosSortValidator } from '../../../middlewares/validators'
+import {
+ deleteMeValidator,
+ getMyVideoImportsValidator,
+ usersVideosValidator,
+ 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'
-const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR })
+const auditLogger = auditLoggerFactory('users')
+
+const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT)
const meRouter = express.Router()
)
meRouter.delete('/me',
authenticate,
- asyncMiddleware(deleteMeValidator),
+ deleteMeValidator,
asyncMiddleware(deleteMe)
)
videoImportsSortValidator,
setDefaultSort,
setDefaultPagination,
+ getMyVideoImportsValidator,
asyncMiddleware(getUserVideoImports)
)
authenticate,
paginationValidator,
videosSortValidator,
- setDefaultSort,
+ setDefaultVideosSort,
setDefaultPagination,
+ asyncMiddleware(usersVideosValidator),
asyncMiddleware(getUserVideos)
)
asyncRetryTransactionMiddleware(updateMyAvatar)
)
+meRouter.delete('/me/avatar',
+ authenticate,
+ asyncRetryTransactionMiddleware(deleteMyAvatar)
+)
+
// ---------------------------------------------------------------------------
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,
+ channelId: res.locals.videoChannel?.id,
+ 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 = {
async function getUserVideoImports (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.User
- const resultList = await VideoImportModel.listUserVideoImportsForApi(
- user.id,
- req.query.start as number,
- req.query.count as number,
- req.query.sort
- )
+ const resultList = await VideoImportModel.listUserVideoImportsForApi({
+ userId: user.id,
+
+ ...pick(req.query, [ 'targetUrl', 'start', 'count', 'sort', 'search', 'videoChannelSyncId' ])
+ })
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
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,
}
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.status(HttpStatusCode.NO_CONTENT_204).end()
}
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.autoPlayNextVideo !== undefined) user.autoPlayNextVideo = body.autoPlayNextVideo
- if (body.videosHistoryEnabled !== undefined) user.videosHistoryEnabled = body.videosHistoryEnabled
- if (body.videoLanguages !== undefined) user.videoLanguages = body.videoLanguages
- if (body.theme !== undefined) user.theme = body.theme
- if (body.noInstanceConfigWarningModal !== undefined) user.noInstanceConfigWarningModal = body.noInstanceConfigWarningModal
- if (body.noWelcomeModal !== undefined) user.noWelcomeModal = body.noWelcomeModal
+ const keysToUpdate: (keyof UserUpdateMe & keyof AttributesOnly<UserModel>)[] = [
+ 'password',
+ 'nsfwPolicy',
+ 'p2pEnabled',
+ 'autoPlayVideo',
+ 'autoPlayNextVideo',
+ 'autoPlayNextVideoPlaylist',
+ 'videosHistoryEnabled',
+ 'videoLanguages',
+ 'theme',
+ 'noInstanceConfigWarningModal',
+ 'noAccountSetupWarningModal',
+ 'noWelcomeModal'
+ ]
+
+ for (const key of keysToUpdate) {
+ if (body[key] !== undefined) user.set(key, body[key])
+ }
+
+ if (body.p2pEnabled !== undefined) {
+ user.set('p2pEnabled', body.p2pEnabled)
+ } else if (body.webTorrentEnabled !== undefined) { // FIXME: deprecated in 4.1
+ user.set('p2pEnabled', body.webTorrentEnabled)
+ }
if (body.email !== undefined) {
if (CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) {
await sequelizeTypescript.transaction(async t => {
await user.save({ transaction: t })
- if (body.displayName !== undefined || body.description !== undefined) {
- const userAccount = await AccountModel.load(user.Account.id, t)
+ if (body.displayName === undefined && body.description === undefined) return
- if (body.displayName !== undefined) userAccount.name = body.displayName
- if (body.description !== undefined) userAccount.description = body.description
- await userAccount.save({ transaction: t })
+ const userAccount = await AccountModel.load(user.Account.id, t)
- await sendUpdateActor(userAccount, t)
- }
+ if (body.displayName !== undefined) userAccount.name = body.displayName
+ if (body.description !== undefined) userAccount.description = body.description
+ await userAccount.save({ transaction: t })
+
+ await sendUpdateActor(userAccount, t)
})
if (sendVerificationEmail === true) {
await sendVerifyUserEmail(user, true)
}
- return res.sendStatus(204)
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
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 avatars = await updateLocalActorImageFiles(
+ userAccount,
+ avatarPhysicalFile,
+ ActorImageType.AVATAR
+ )
+
+ return res.json({
+ // TODO: remove, deprecated in 4.2
+ avatar: getBiggestActorImage(avatars).toFormattedJSON(),
+ avatars: avatars.map(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.json({ avatar: avatar.toFormattedJSON() })
+ return res.json({ avatars: [] })
}
projects / github / Chocobozzz / PeerTube.git / blobdiff