yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 09:49:20 +02:00
Code Issues Releases Wiki Activity

Add action hooks to user routes

Browse source
This commit is contained in:
Chocobozzz 2019-12-06 15:59:12 +01:00
parent 349be1eaa9
commit 6f3fe96f40
No known key found for this signature in database
GPG key ID: 583A612D890159BE
6 changed files with 141 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@ import { sequelizeTypescript } from '../../../initializers/database'
import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
import { UserRegister } from '../../../../shared/models/users/user-register.model'
import { MUser, MUserAccountDefault } from '@server/typings/models'
import { Hooks } from '@server/lib/plugins/hooks'
const auditLogger = auditLoggerFactory('users')
@ -172,7 +173,7 @@ usersRouter.post('/:id/verify-email',
usersRouter.post('/token',
loginRateLimiter,
token,
success
tokenSuccess
)
// TODO: Once https://github.com/oauthjs/node-oauth2-server/pull/289 is merged, implement revoke token route
@ -198,11 +199,13 @@ async function createUser (req: express.Request, res: express.Response) {
adminFlags: body.adminFlags || UserAdminFlag.NONE
}) as MUser
const { user, account } = await createUserAccountAndChannelAndPlaylist({ userToCreate: userToCreate })
const { user, account, videoChannel } = await createUserAccountAndChannelAndPlaylist({ userToCreate: userToCreate })
auditLogger.create(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()))
logger.info('User %s with its channel and account created.', body.username)
Hooks.runAction('action:api.user.created', { body, user, account, videoChannel })
return res.json({
user: {
id: user.id,
@ -228,7 +231,7 @@ async function registerUser (req: express.Request, res: express.Response) {
emailVerified: CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION ? false : null
})
const { user } = await createUserAccountAndChannelAndPlaylist({
const { user, account, videoChannel } = await createUserAccountAndChannelAndPlaylist({
userToCreate: userToCreate,
userDisplayName: body.displayName || undefined,
channelNames: body.channel
@ -243,6 +246,8 @@ async function registerUser (req: express.Request, res: express.Response) {
Notifier.Instance.notifyOnNewUserRegistration(user)
Hooks.runAction('action:api.user.registered', { body, user, account, videoChannel })
return res.type('json').status(204).end()
}
@ -251,6 +256,8 @@ async function unblockUser (req: express.Request, res: express.Response) {
await changeUserBlock(res, user, false)
Hooks.runAction('action:api.user.unblocked', { user })
return res.status(204).end()
}
@ -260,6 +267,8 @@ async function blockUser (req: express.Request, res: express.Response) {
await changeUserBlock(res, user, true, reason)
Hooks.runAction('action:api.user.blocked', { user })
return res.status(204).end()
}
@ -286,6 +295,8 @@ async function removeUser (req: express.Request, res: express.Response) {
auditLogger.delete(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()))
Hooks.runAction('action:api.user.deleted', { user })
return res.sendStatus(204)
}
@ -310,6 +321,8 @@ async function updateUser (req: express.Request, res: express.Response) {
auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView)
Hooks.runAction('action:api.user.updated', { user })
// Don't need to send this update to followers, these attributes are not federated
return res.sendStatus(204)
@ -356,8 +369,10 @@ async function verifyUserEmail (req: express.Request, res: express.Response) {
return res.status(204).end()
}
function success (req: express.Request, res: express.Response) {
res.end()
function tokenSuccess (req: express.Request) {
const username = req.body.username
Hooks.runAction('action:api.user.oauth2-got-token', { username, ip: req.ip })
}
async function changeUserBlock (res: express.Response, user: MUserAccountDefault, block: boolean, reason?: string) {