interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make channelName optionnal in tests only and validators 

Fix tests channel displayName

Make channelName in createUser optionnal on server side to not break api

Fix auto channelName with createUser in tests
This commit is contained in:
kimsible 2020-07-29 20:10:03 +02:00 committed by Chocobozzz
parent 69db147043
commit 766d13b447
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/middlewares/validators/users.ts
View File

@ -56,7 +56,7 @@ const usersAddValidator = [
body('username').custom(isUserUsernameValid).withMessage('Should have a valid username (lowercase alphanumeric characters)'), body('username').custom(isUserUsernameValid).withMessage('Should have a valid username (lowercase alphanumeric characters)'),
body('password').custom(isUserPasswordValidOrEmpty).withMessage('Should have a valid password'), body('password').custom(isUserPasswordValidOrEmpty).withMessage('Should have a valid password'),
body('email').isEmail().withMessage('Should have a valid email'), body('email').isEmail().withMessage('Should have a valid email'),
body('channelName').custom(isActorPreferredUsernameValid).withMessage('Should have a valid channel name'), body('channelName').optional().custom(isActorPreferredUsernameValid).withMessage('Should have a valid channel name'),
body('videoQuota').custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'), body('videoQuota').custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'),
body('videoQuotaDaily').custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily user quota'), body('videoQuotaDaily').custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily user quota'),
body('role') body('role')
@ -76,20 +76,17 @@ const usersAddValidator = [
.json({ error: 'You can only create users (and not administrators or moderators)' }) .json({ error: 'You can only create users (and not administrators or moderators)' })
} }
if (!req.body.channelName) { if (req.body.channelName) {
return res.status(400) if (req.body.channelName === req.body.username) {
.json({ error: 'Channel name is required.' }) return res.status(400)
} .json({ error: 'Channel name cannot be the same as user username.' })
}
if (req.body.channelName === req.body.username) { const existing = await ActorModel.loadLocalByName(req.body.channelName)
return res.status(400) if (existing) {
.json({ error: 'Channel name cannot be the same as user username.' }) return res.status(409)
} .json({ error: `Channel with name ${req.body.channelName} already exists.` })
}
const existing = await ActorModel.loadLocalByName(req.body.channelName)
if (existing) {
return res.status(409)
.json({ error: `Channel with name ${req.body.channelName} already exists.` })
} }
return next() return next()