-import * as express from 'express'
+import express from 'express'
import { body, param, query } from 'express-validator'
-import { VIDEO_CHANNELS } from '@server/initializers/constants'
-import { MChannelAccountDefault, MUser } from '@server/types/models'
-import { UserRight } from '../../../../shared'
-import { isActorPreferredUsernameValid } from '../../../helpers/custom-validators/activitypub/actor'
+import { CONFIG } from '@server/initializers/config'
+import { MChannelAccountDefault } from '@server/types/models'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
import { isBooleanValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc'
import {
isVideoChannelDescriptionValid,
- isVideoChannelNameValid,
- isVideoChannelSupportValid
+ isVideoChannelDisplayNameValid,
+ isVideoChannelSupportValid,
+ isVideoChannelUsernameValid
} from '../../../helpers/custom-validators/video-channels'
import { logger } from '../../../helpers/logger'
-import { doesLocalVideoChannelNameExist, doesVideoChannelNameWithHostExist } from '../../../helpers/middlewares'
-import { ActorModel } from '../../../models/activitypub/actor'
+import { ActorModel } from '../../../models/actor/actor'
import { VideoChannelModel } from '../../../models/video/video-channel'
-import { areValidationErrors } from '../utils'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { areValidationErrors, doesVideoChannelNameWithHostExist } from '../shared'
const videoChannelsAddValidator = [
- body('name').custom(isActorPreferredUsernameValid).withMessage('Should have a valid channel name'),
- body('displayName').custom(isVideoChannelNameValid).withMessage('Should have a valid display name'),
+ body('name').custom(isVideoChannelUsernameValid).withMessage('Should have a valid channel name'),
+ body('displayName').custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'),
body('description').optional().custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'),
body('support').optional().custom(isVideoChannelSupportValid).withMessage('Should have a valid support text'),
const actor = await ActorModel.loadLocalByName(req.body.name)
if (actor) {
- res.status(HttpStatusCode.CONFLICT_409)
- .send({ error: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' })
- .end()
+ res.fail({
+ status: HttpStatusCode.CONFLICT_409,
+ message: 'Another actor (account/channel) with this name on this instance already exists or has already existed.'
+ })
return false
}
const count = await VideoChannelModel.countByAccount(res.locals.oauth.token.User.Account.id)
- if (count >= VIDEO_CHANNELS.MAX_PER_USER) {
- res.status(HttpStatusCode.BAD_REQUEST_400)
- .send({ error: `You cannot create more than ${VIDEO_CHANNELS.MAX_PER_USER} channels` })
- .end()
+ if (count >= CONFIG.VIDEO_CHANNELS.MAX_PER_USER) {
+ res.fail({ message: `You cannot create more than ${CONFIG.VIDEO_CHANNELS.MAX_PER_USER} channels` })
return false
}
param('nameWithHost').exists().withMessage('Should have an video channel name with host'),
body('displayName')
.optional()
- .custom(isVideoChannelNameValid).withMessage('Should have a valid display name'),
+ .custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'),
body('description')
.optional()
.custom(isVideoChannelDescriptionValid).withMessage('Should have a valid description'),
.optional()
.custom(isBooleanValid).withMessage('Should have a valid bulkVideosSupportUpdate boolean field'),
- async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking videoChannelsUpdate parameters', { parameters: req.body })
if (areValidationErrors(req, res)) return
- if (!await doesVideoChannelNameWithHostExist(req.params.nameWithHost, res)) return
-
- // We need to make additional checks
- if (res.locals.videoChannel.Actor.isOwned() === false) {
- return res.status(HttpStatusCode.FORBIDDEN_403)
- .json({ error: 'Cannot update video channel of another server' })
- }
-
- if (res.locals.videoChannel.Account.userId !== res.locals.oauth.token.User.id) {
- return res.status(HttpStatusCode.FORBIDDEN_403)
- .json({ error: 'Cannot update video channel of another user' })
- }
return next()
}
]
const videoChannelsRemoveValidator = [
- param('nameWithHost').exists().withMessage('Should have an video channel name with host'),
-
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking videoChannelsRemove parameters', { parameters: req.params })
- if (areValidationErrors(req, res)) return
- if (!await doesVideoChannelNameWithHostExist(req.params.nameWithHost, res)) return
-
- if (!checkUserCanDeleteVideoChannel(res.locals.oauth.token.User, res.locals.videoChannel, res)) return
- if (!await checkVideoChannelIsNotTheLastOne(res)) return
+ if (!await checkVideoChannelIsNotTheLastOne(res.locals.videoChannel, res)) return
return next()
}
}
]
-const localVideoChannelValidator = [
- param('name').custom(isVideoChannelNameValid).withMessage('Should have a valid video channel name'),
-
- async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking localVideoChannelValidator parameters', { parameters: req.params })
-
- if (areValidationErrors(req, res)) return
- if (!await doesLocalVideoChannelNameExist(req.params.name, res)) return
+const ensureIsLocalChannel = [
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ if (res.locals.videoChannel.Actor.isOwned() === false) {
+ return res.fail({
+ status: HttpStatusCode.FORBIDDEN_403,
+ message: 'This channel is not owned.'
+ })
+ }
return next()
}
}
]
+const videoChannelsListValidator = [
+ query('search').optional().not().isEmpty().withMessage('Should have a valid search'),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking video channels search query', { parameters: req.query })
+
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
// ---------------------------------------------------------------------------
export {
videoChannelsUpdateValidator,
videoChannelsRemoveValidator,
videoChannelsNameWithHostValidator,
- localVideoChannelValidator,
+ ensureIsLocalChannel,
+ videoChannelsListValidator,
videoChannelStatsValidator
}
// ---------------------------------------------------------------------------
-function checkUserCanDeleteVideoChannel (user: MUser, videoChannel: MChannelAccountDefault, res: express.Response) {
- if (videoChannel.Actor.isOwned() === false) {
- res.status(HttpStatusCode.FORBIDDEN_403)
- .json({ error: 'Cannot remove video channel of another server.' })
- .end()
-
- return false
- }
-
- // Check if the user can delete the video channel
- // The user can delete it if s/he is an admin
- // Or if s/he is the video channel's account
- if (user.hasRight(UserRight.REMOVE_ANY_VIDEO_CHANNEL) === false && videoChannel.Account.userId !== user.id) {
- res.status(HttpStatusCode.FORBIDDEN_403)
- .json({ error: 'Cannot remove video channel of another user' })
- .end()
-
- return false
- }
-
- return true
-}
-
-async function checkVideoChannelIsNotTheLastOne (res: express.Response) {
- const count = await VideoChannelModel.countByAccount(res.locals.oauth.token.User.Account.id)
+async function checkVideoChannelIsNotTheLastOne (videoChannel: MChannelAccountDefault, res: express.Response) {
+ const count = await VideoChannelModel.countByAccount(videoChannel.Account.id)
if (count <= 1) {
- res.status(HttpStatusCode.CONFLICT_409)
- .json({ error: 'Cannot remove the last channel of this user' })
- .end()
-
+ res.fail({
+ status: HttpStatusCode.CONFLICT_409,
+ message: 'Cannot remove the last channel of this user'
+ })
return false
}
projects / github / Chocobozzz / PeerTube.git / blobdiff