import { database as db } from '../../initializers/database'
import { USER_ROLES } from '../../initializers'
-import { logger, getFormatedObjects } from '../../helpers'
+import { logger, getFormattedObjects } from '../../helpers'
import {
authenticate,
ensureIsAdmin,
- ensureUserRegistrationEnabled,
+ ensureUserRegistrationAllowed,
usersAddValidator,
usersUpdateValidator,
usersRemoveValidator,
setUsersSort,
token
} from '../../middlewares'
-import { UserVideoRate as FormatedUserVideoRate, UserCreate, UserUpdate } from '../../../shared'
+import { UserVideoRate as FormattedUserVideoRate, UserCreate, UserUpdate } from '../../../shared'
const usersRouter = express.Router()
)
usersRouter.post('/register',
- ensureUserRegistrationEnabled,
+ ensureUserRegistrationAllowed,
usersAddValidator,
createUser
)
function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
db.User.loadByUsername(res.locals.oauth.token.user.username)
- .then(user => res.json(user.toFormatedJSON()))
+ .then(user => res.json(user.toFormattedJSON()))
.catch(err => next(err))
}
function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) {
- const videoId = '' + req.params.videoId
+ const videoId = +req.params.videoId
const userId = +res.locals.oauth.token.User.id
db.UserVideoRate.load(userId, videoId, null)
.then(ratingObj => {
const rating = ratingObj ? ratingObj.type : 'none'
- const json: FormatedUserVideoRate = {
+ const json: FormattedUserVideoRate = {
videoId,
rating
}
function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
db.User.listForApi(req.query.start, req.query.count, req.query.sort)
.then(resultList => {
- res.json(getFormatedObjects(resultList.data, resultList.total))
+ res.json(getFormattedObjects(resultList.data, resultList.total))
})
.catch(err => next(err))
}