X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=3106df9b9279105175eb63785d39757c75c8fd36;hb=d3ea89759104e6c14b00443526f2c2a0a13aeb97;hp=41ffb64cb202868e878188f49d86ce562032b803;hpb=571389d43b8fc8aaf27e77c06f19b320b08dbbc9;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index 41ffb64cb..3106df9b9 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -1,8 +1,8 @@
 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,
@@ -11,6 +11,7 @@ import {
   paginationValidator,
   setPagination,
   setUsersSort,
+  setVideosSort,
   token,
   usersAddValidator,
   usersGetValidator,
@@ -21,9 +22,10 @@ import {
   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()
 
@@ -43,11 +45,13 @@ usersRouter.get('/me/videos',
 
 usersRouter.get('/me/videos/:videoId/rating',
   authenticate,
-  usersVideoRatingValidator,
+  asyncMiddleware(usersVideoRatingValidator),
   asyncMiddleware(getUserVideoRating)
 )
 
 usersRouter.get('/',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_USERS),
   paginationValidator,
   usersSortValidator,
   setUsersSort,
@@ -56,21 +60,21 @@ usersRouter.get('/',
 )
 
 usersRouter.get('/:id',
-  usersGetValidator,
+  asyncMiddleware(usersGetValidator),
   getUser
 )
 
 usersRouter.post('/',
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_USERS),
-  usersAddValidator,
-  createUserRetryWrapper
+  asyncMiddleware(usersAddValidator),
+  asyncMiddleware(createUserRetryWrapper)
 )
 
 usersRouter.post('/register',
-  ensureUserRegistrationAllowed,
-  usersRegisterValidator,
-  asyncMiddleware(registerUser)
+  asyncMiddleware(ensureUserRegistrationAllowed),
+  asyncMiddleware(usersRegisterValidator),
+  asyncMiddleware(registerUserRetryWrapper)
 )
 
 usersRouter.put('/me',
@@ -82,14 +86,14 @@ usersRouter.put('/me',
 usersRouter.put('/:id',
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_USERS),
-  usersUpdateValidator,
+  asyncMiddleware(usersUpdateValidator),
   asyncMiddleware(updateUser)
 )
 
 usersRouter.delete('/:id',
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_USERS),
-  usersRemoveValidator,
+  asyncMiddleware(usersRemoveValidator),
   asyncMiddleware(removeUser)
 )
 
@@ -105,15 +109,15 @@ export {
 // ---------------------------------------------------------------------------
 
 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 createUserRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
   const options = {
-    arguments: [ req, res ],
+    arguments: [ req ],
     errorMessage: 'Cannot insert the user with many retries.'
   }
 
@@ -123,13 +127,14 @@ async function createUserRetryWrapper (req: express.Request, res: express.Respon
   return res.type('json').status(204).end()
 }
 
-async function createUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+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
   })
@@ -139,25 +144,38 @@ async function createUser (req: express.Request, res: express.Response, next: ex
   logger.info('User %s with its channel and account created.', body.username)
 }
 
-async function registerUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function registerUserRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const options = {
+    arguments: [ req ],
+    errorMessage: 'Cannot insert the user with many retries.'
+  }
+
+  await retryTransactionWrapper(registerUser, options)
+
+  return res.type('json').status(204).end()
+}
+
+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
   })
 
   await createUserAccountAndChannel(user)
-  return res.type('json').status(204).end()
+
+  logger.info('User %s with its channel and account registered.', body.username)
 }
 
 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())
 }
@@ -170,7 +188,7 @@ async function getUserVideoRating (req: express.Request, res: express.Response,
   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 = {
@@ -181,13 +199,13 @@ async function getUserVideoRating (req: express.Request, res: express.Response,
 }
 
 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()
 
@@ -203,6 +221,7 @@ async function updateMe (req: express.Request, res: express.Response, next: expr
   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()
 
@@ -211,7 +230,7 @@ async function updateMe (req: express.Request, res: express.Response, next: expr
 
 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