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

Support roles with rights and add moderator role

Browse source
This commit is contained in:
Chocobozzz 2017-10-27 16:55:03 +02:00
parent e02573ad67
commit 954605a804
No known key found for this signature in database
GPG key ID: 583A612D890159BE
51 changed files with 378 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/controllers/api/users.ts
View file

@ -1,11 +1,10 @@
import * as express from 'express'
import { database as db } from '../../initializers/database'
import { USER_ROLES, CONFIG } from '../../initializers'
import { database as db, CONFIG } from '../../initializers'
import { logger, getFormattedObjects, retryTransactionWrapper } from '../../helpers'
import {
authenticate,
ensureIsAdmin,
ensureUserHasRight,
ensureUserRegistrationAllowed,
usersAddValidator,
usersRegisterValidator,
@ -25,7 +24,9 @@ import {
UserVideoRate as FormattedUserVideoRate,
UserCreate,
UserUpdate,
UserUpdateMe
UserUpdateMe,
UserRole,
UserRight
} from '../../../shared'
import { createUserAuthorAndChannel } from '../../lib'
import { UserInstance } from '../../models'
@ -58,7 +59,7 @@ usersRouter.get('/:id',
usersRouter.post('/',
authenticate,
ensureIsAdmin,
ensureUserHasRight(UserRight.MANAGE_USERS),
usersAddValidator,
createUserRetryWrapper
)
@ -77,14 +78,14 @@ usersRouter.put('/me',
usersRouter.put('/:id',
authenticate,
ensureIsAdmin,
ensureUserHasRight(UserRight.MANAGE_USERS),
usersUpdateValidator,
asyncMiddleware(updateUser)
)
usersRouter.delete('/:id',
authenticate,
ensureIsAdmin,
ensureUserHasRight(UserRight.MANAGE_USERS),
usersRemoveValidator,
asyncMiddleware(removeUser)
)
@ -119,7 +120,7 @@ async function createUser (req: express.Request, res: express.Response, next: ex
password: body.password,
email: body.email,
displayNSFW: false,
role: USER_ROLES.USER,
role: body.role,
videoQuota: body.videoQuota
})
@ -136,7 +137,7 @@ async function registerUser (req: express.Request, res: express.Response, next:
password: body.password,
email: body.email,
displayNSFW: false,
role: USER_ROLES.USER,
role: UserRole.USER,
videoQuota: CONFIG.USER.VIDEO_QUOTA
})
@ -203,6 +204,7 @@ async function updateUser (req: express.Request, res: express.Response, next: ex
if (body.email !== undefined) user.email = body.email
if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota
if (body.role !== undefined) user.role = body.role
await user.save()