Fix lint

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / video-channels.ts

diff --git a/server/middlewares/validators/video-channels.ts b/server/middlewares/validators/video-channels.ts
index 979fbd34a0b3995e1fbb44d8578d977851d6769d..0326e05b916209a9c2b240247523762bac58938a 100644 (file)
--- a/server/middlewares/validators/video-channels.ts
+++ b/server/middlewares/validators/video-channels.ts
@@ -9,17 +9,19 @@ import {
   isVideoChannelDescriptionValid,
   isVideoChannelNameValid,
   checkVideoChannelExists,
-  checkVideoAuthorExists
+  checkVideoAccountExists
 } from '../../helpers'
+import { UserInstance } from '../../models'
+import { UserRight } from '../../../shared'
 
-const listVideoAuthorChannelsValidator = [
-  param('authorId').custom(isIdOrUUIDValid).withMessage('Should have a valid author id'),
+const listVideoAccountChannelsValidator = [
+  param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking listVideoAuthorChannelsValidator parameters', { parameters: req.body })
+    logger.debug('Checking listVideoAccountChannelsValidator parameters', { parameters: req.body })
 
     checkErrors(req, res, () => {
-      checkVideoAuthorExists(req.params.authorId, res, next)
+      checkVideoAccountExists(req.params.accountId, res, next)
     })
   }
 ]
@@ -48,11 +50,11 @@ const videoChannelsUpdateValidator = [
         // We need to make additional checks
         if (res.locals.videoChannel.isOwned() === false) {
           return res.status(403)
-            .json({ error: 'Cannot update video channel of another pod' })
+            .json({ error: 'Cannot update video channel of another server' })
             .end()
         }
 
-        if (res.locals.videoChannel.Author.userId !== res.locals.oauth.token.User.id) {
+        if (res.locals.videoChannel.Account.userId !== res.locals.oauth.token.User.id) {
           return res.status(403)
             .json({ error: 'Cannot update video channel of another user' })
             .end()
@@ -81,7 +83,7 @@ const videoChannelsRemoveValidator = [
   }
 ]
 
-const videoChannelGetValidator = [
+const videoChannelsGetValidator = [
   param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
@@ -96,29 +98,29 @@ const videoChannelGetValidator = [
 // ---------------------------------------------------------------------------
 
 export {
-  listVideoAuthorChannelsValidator,
+  listVideoAccountChannelsValidator,
   videoChannelsAddValidator,
   videoChannelsUpdateValidator,
   videoChannelsRemoveValidator,
-  videoChannelGetValidator
+  videoChannelsGetValidator
 }
 
 // ---------------------------------------------------------------------------
 
 function checkUserCanDeleteVideoChannel (res: express.Response, callback: () => void) {
-  const user = res.locals.oauth.token.User
+  const user: UserInstance = res.locals.oauth.token.User
 
   // Retrieve the user who did the request
   if (res.locals.videoChannel.isOwned() === false) {
     return res.status(403)
-              .json({ error: 'Cannot remove video channel of another pod.' })
+              .json({ error: 'Cannot remove video channel of another server.' })
               .end()
   }
 
   // Check if the user can delete the video channel
   // The user can delete it if s/he is an admin
-  // Or if s/he is the video channel's author
-  if (user.isAdmin() === false && res.locals.videoChannel.Author.userId !== user.id) {
+  // Or if s/he is the video channel's account
+  if (user.hasRight(UserRight.REMOVE_ANY_VIDEO_CHANNEL) === false && res.locals.videoChannel.Account.userId !== user.id) {
     return res.status(403)
               .json({ error: 'Cannot remove video channel of another user' })
               .end()
@@ -129,7 +131,7 @@ function checkUserCanDeleteVideoChannel (res: express.Response, callback: () =>
 }
 
 function checkVideoChannelIsNotTheLastOne (res: express.Response, callback: () => void) {
-  db.VideoChannel.countByAuthor(res.locals.oauth.token.User.Author.id)
+  db.VideoChannel.countByAccount(res.locals.oauth.token.User.Account.id)
     .then(count => {
       if (count <= 1) {
         return res.status(409)