import * as express from 'express'
import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared'
import { getFormattedObjects, logger, retryTransactionWrapper } from '../../helpers'
-import { CONFIG, database as db } from '../../initializers'
-import { createUserAccountAndChannel } from '../../lib'
+import { CONFIG } from '../../initializers'
+import { createUserAccountAndChannel } from '../../lib/user'
import {
asyncMiddleware,
authenticate,
paginationValidator,
setPagination,
setUsersSort,
+ setVideosSort,
token,
usersAddValidator,
usersGetValidator,
usersUpdateValidator,
usersVideoRatingValidator
} from '../../middlewares'
-import { setVideosSort } from '../../middlewares/sort'
-import { videosSortValidator } from '../../middlewares/validators/sort'
-import { UserInstance } from '../../models'
+import { videosSortValidator } from '../../middlewares/validators'
+import { AccountVideoRateModel } from '../../models/account/account-video-rate'
+import { UserModel } from '../../models/account/user'
+import { VideoModel } from '../../models/video/video'
const usersRouter = express.Router()
)
usersRouter.get('/',
+ authenticate,
+ ensureUserHasRight(UserRight.MANAGE_USERS),
paginationValidator,
usersSortValidator,
setUsersSort,
// ---------------------------------------------------------------------------
async function getUserVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
- const user = res.locals.oauth.token.User
- const resultList = await db.Video.listUserVideosForApi(user.id ,req.query.start, req.query.count, req.query.sort)
+ const user = res.locals.oauth.token.User as UserModel
+ const resultList = await VideoModel.listUserVideosForApi(user.id ,req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function createUser (req: express.Request) {
const body: UserCreate = req.body
- const user = db.User.build({
+ const user = new UserModel({
username: body.username,
password: body.password,
email: body.email,
displayNSFW: false,
+ autoPlayVideo: true,
role: body.role,
videoQuota: body.videoQuota
})
async function registerUser (req: express.Request) {
const body: UserCreate = req.body
- const user = db.User.build({
+ const user = new UserModel({
username: body.username,
password: body.password,
email: body.email,
displayNSFW: false,
+ autoPlayVideo: true,
role: UserRole.USER,
videoQuota: CONFIG.USER.VIDEO_QUOTA
})
async function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
// We did not load channels in res.locals.user
- const user = await db.User.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username)
+ const user = await UserModel.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username)
return res.json(user.toFormattedJSON())
}
const videoId = +req.params.videoId
const accountId = +res.locals.oauth.token.User.Account.id
- const ratingObj = await db.AccountVideoRate.load(accountId, videoId, null)
+ const ratingObj = await AccountVideoRateModel.load(accountId, videoId, null)
const rating = ratingObj ? ratingObj.type : 'none'
const json: FormattedUserVideoRate = {
}
async function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.User.listForApi(req.query.start, req.query.count, req.query.sort)
+ const resultList = await UserModel.listForApi(req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) {
- const user = await db.User.loadById(req.params.id)
+ const user = await UserModel.loadById(req.params.id)
await user.destroy()
if (body.password !== undefined) user.password = body.password
if (body.email !== undefined) user.email = body.email
if (body.displayNSFW !== undefined) user.displayNSFW = body.displayNSFW
+ if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo
await user.save()
async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
const body: UserUpdate = req.body
- const user: UserInstance = res.locals.user
+ const user = res.locals.user as UserModel
if (body.email !== undefined) user.email = body.email
if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota