X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers.ts;h=ac7c87517d8d0e9458f4c450edacba9d9aa433db;hb=47e0652b4a98916d4a1d012fbec61afd73a30565;hp=fdc9b0c879ef43653a4b5550e59032d9151a6d2f;hpb=954605a804da399317ca62afa2fb9244afa11ebf;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index fdc9b0c87..ac7c87517 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -1,34 +1,28 @@
 import * as express from 'express'
-
-import { database as db, CONFIG } from '../../initializers'
-import { logger, getFormattedObjects, retryTransactionWrapper } from '../../helpers'
+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 {
+  asyncMiddleware,
   authenticate,
   ensureUserHasRight,
   ensureUserRegistrationAllowed,
-  usersAddValidator,
-  usersRegisterValidator,
-  usersUpdateValidator,
-  usersUpdateMeValidator,
-  usersRemoveValidator,
-  usersVideoRatingValidator,
-  usersGetValidator,
   paginationValidator,
   setPagination,
-  usersSortValidator,
   setUsersSort,
   token,
-  asyncMiddleware
+  usersAddValidator,
+  usersGetValidator,
+  usersRegisterValidator,
+  usersRemoveValidator,
+  usersSortValidator,
+  usersUpdateMeValidator,
+  usersUpdateValidator,
+  usersVideoRatingValidator
 } from '../../middlewares'
-import {
-  UserVideoRate as FormattedUserVideoRate,
-  UserCreate,
-  UserUpdate,
-  UserUpdateMe,
-  UserRole,
-  UserRight
-} from '../../../shared'
-import { createUserAuthorAndChannel } from '../../lib'
+import { setVideosSort } from '../../middlewares/sort'
+import { videosSortValidator } from '../../middlewares/validators/sort'
 import { UserInstance } from '../../models'
 
 const usersRouter = express.Router()
@@ -38,6 +32,15 @@ usersRouter.get('/me',
   asyncMiddleware(getUserInformation)
 )
 
+usersRouter.get('/me/videos',
+  authenticate,
+  paginationValidator,
+  videosSortValidator,
+  setVideosSort,
+  setPagination,
+  asyncMiddleware(getUserVideos)
+)
+
 usersRouter.get('/me/videos/:videoId/rating',
   authenticate,
   usersVideoRatingValidator,
@@ -67,7 +70,7 @@ usersRouter.post('/',
 usersRouter.post('/register',
   ensureUserRegistrationAllowed,
   usersRegisterValidator,
-  asyncMiddleware(registerUser)
+  asyncMiddleware(registerUserRetryWrapper)
 )
 
 usersRouter.put('/me',
@@ -101,9 +104,16 @@ 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)
+
+  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.'
   }
 
@@ -113,7 +123,7 @@ 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({
     username: body.username,
@@ -124,12 +134,23 @@ async function createUser (req: express.Request, res: express.Response, next: ex
     videoQuota: body.videoQuota
   })
 
-  await createUserAuthorAndChannel(user)
+  await createUserAccountAndChannel(user)
+
+  logger.info('User %s with its channel and account created.', body.username)
+}
+
+async function registerUserRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const options = {
+    arguments: [ req ],
+    errorMessage: 'Cannot insert the user with many retries.'
+  }
 
-  logger.info('User %s with its channel and author created.', body.username)
+  await retryTransactionWrapper(registerUser, options)
+
+  return res.type('json').status(204).end()
 }
 
-async function registerUser (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function registerUser (req: express.Request) {
   const body: UserCreate = req.body
 
   const user = db.User.build({
@@ -141,11 +162,13 @@ async function registerUser (req: express.Request, res: express.Response, next:
     videoQuota: CONFIG.USER.VIDEO_QUOTA
   })
 
-  await createUserAuthorAndChannel(user)
-  return res.type('json').status(204).end()
+  await createUserAccountAndChannel(user)
+
+  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)
 
   return res.json(user.toFormattedJSON())
@@ -157,9 +180,9 @@ function getUser (req: express.Request, res: express.Response, next: express.Nex
 
 async function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) {
   const videoId = +req.params.videoId
-  const userId = +res.locals.oauth.token.User.id
+  const accountId = +res.locals.oauth.token.User.Account.id
 
-  const ratingObj = await db.UserVideoRate.load(userId, videoId, null)
+  const ratingObj = await db.AccountVideoRate.load(accountId, videoId, null)
   const rating = ratingObj ? ratingObj.type : 'none'
 
   const json: FormattedUserVideoRate = {