forks/peertube
1
0
Fork 0
Code Releases Activity

Add missing audit log if the user deletes its account

Browse source
This commit is contained in:
Chocobozzz 2021-01-04 09:54:48 +01:00
parent afd4ee86dd
commit 2dbc170da3
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/controllers/api/users/index.ts
View file

@ -305,10 +305,10 @@ async function listUsers (req: express.Request, res: express.Response) {
async function removeUser (req: express.Request, res: express.Response) { async function removeUser (req: express.Request, res: express.Response) {
const user = res.locals.user const user = res.locals.user
await user.destroy()
auditLogger.delete(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON())) auditLogger.delete(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()))
await user.destroy()
Hooks.runAction('action:api.user.deleted', { user }) Hooks.runAction('action:api.user.deleted', { user })
return res.sendStatus(HttpStatusCode.NO_CONTENT_204) return res.sendStatus(HttpStatusCode.NO_CONTENT_204)

9
server/controllers/api/users/me.ts
View file

@ -1,6 +1,8 @@
import 'multer' import 'multer'
import * as express from 'express' import * as express from 'express'
import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '@server/helpers/audit-logger'
import { UserUpdateMe, UserVideoRate as FormattedUserVideoRate, VideoSortField } from '../../../../shared' import { UserUpdateMe, UserVideoRate as FormattedUserVideoRate, VideoSortField } from '../../../../shared'
import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import { UserVideoQuota } from '../../../../shared/models/users/user-video-quota.model' import { UserVideoQuota } from '../../../../shared/models/users/user-video-quota.model'
import { createReqFiles } from '../../../helpers/express-utils' import { createReqFiles } from '../../../helpers/express-utils'
import { getFormattedObjects } from '../../../helpers/utils' import { getFormattedObjects } from '../../../helpers/utils'
@ -28,7 +30,8 @@ import { AccountVideoRateModel } from '../../../models/account/account-video-rat
import { UserModel } from '../../../models/account/user' import { UserModel } from '../../../models/account/user'
import { VideoModel } from '../../../models/video/video' import { VideoModel } from '../../../models/video/video'
import { VideoImportModel } from '../../../models/video/video-import' import { VideoImportModel } from '../../../models/video/video-import'
import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
const auditLogger = auditLoggerFactory('users')
const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR }) const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR })
@ -159,7 +162,9 @@ async function getUserVideoRating (req: express.Request, res: express.Response)
} }
async function deleteMe (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() await user.destroy()

2
server/tests/api/users/users-verification.ts
View file

@ -104,6 +104,8 @@ describe('Test users account verification', function () {
}) })
it('Should be able to change the user email', async function () { it('Should be able to change the user email', async function () {
this.timeout(10000)
let updateVerificationString: string let updateVerificationString: string
{ {