From ad9e39fb815d85e5e718c40540fa75471474fa17 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 25 May 2018 09:57:16 +0200
Subject: Only use account name in routes

---
 server/middlewares/validators/account.ts        | 32 +++----------------------
 server/middlewares/validators/video-channels.ts |  6 ++---
 2 files changed, 6 insertions(+), 32 deletions(-)

(limited to 'server/middlewares')

diff --git a/server/middlewares/validators/account.ts b/server/middlewares/validators/account.ts
index c01e742da..b3a51e631 100644
--- a/server/middlewares/validators/account.ts
+++ b/server/middlewares/validators/account.ts
@@ -1,15 +1,8 @@
 import * as express from 'express'
 import { param } from 'express-validator/check'
-import {
-  isAccountIdExist,
-  isAccountIdValid,
-  isAccountNameValid,
-  isAccountNameWithHostExist,
-  isLocalAccountNameExist
-} from '../../helpers/custom-validators/accounts'
+import { isAccountNameValid, isAccountNameWithHostExist, isLocalAccountNameExist } from '../../helpers/custom-validators/accounts'
 import { logger } from '../../helpers/logger'
 import { areValidationErrors } from './utils'
-import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
 
 const localAccountValidator = [
   param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'),
@@ -24,32 +17,14 @@ const localAccountValidator = [
   }
 ]
 
-const accountsGetValidator = [
-  param('id').custom(isAccountIdValid).withMessage('Should have a valid id/uuid/name/name with host'),
-
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking accountsGetValidator parameters', { parameters: req.params })
-
-    if (areValidationErrors(req, res)) return
-
-    let accountFetched = false
-    if (isIdOrUUIDValid(req.params.id)) accountFetched = await isAccountIdExist(req.params.id, res, false)
-    if (!accountFetched) accountFetched = await isAccountNameWithHostExist(req.params.id, res, true)
-
-    if (!accountFetched) return
-
-    return next()
-  }
-]
-
 const accountsNameWithHostGetValidator = [
-  param('nameWithHost').exists().withMessage('Should have an account name with host'),
+  param('accountName').exists().withMessage('Should have an account name with host'),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking accountsNameWithHostGetValidator parameters', { parameters: req.params })
 
     if (areValidationErrors(req, res)) return
-    if (!await isAccountNameWithHostExist(req.params.nameWithHost, res)) return
+    if (!await isAccountNameWithHostExist(req.params.accountName, res)) return
 
     return next()
   }
@@ -59,6 +34,5 @@ const accountsNameWithHostGetValidator = [
 
 export {
   localAccountValidator,
-  accountsGetValidator,
   accountsNameWithHostGetValidator
 }
diff --git a/server/middlewares/validators/video-channels.ts b/server/middlewares/validators/video-channels.ts
index 92c0de419..a5be5f114 100644
--- a/server/middlewares/validators/video-channels.ts
+++ b/server/middlewares/validators/video-channels.ts
@@ -1,7 +1,7 @@
 import * as express from 'express'
 import { body, param } from 'express-validator/check'
 import { UserRight } from '../../../shared'
-import { isAccountIdExist } from '../../helpers/custom-validators/accounts'
+import { isAccountIdExist, isAccountNameWithHostExist } from '../../helpers/custom-validators/accounts'
 import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
 import {
   isVideoChannelDescriptionValid,
@@ -15,13 +15,13 @@ import { VideoChannelModel } from '../../models/video/video-channel'
 import { areValidationErrors } from './utils'
 
 const listVideoAccountChannelsValidator = [
-  param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),
+  param('accountName').exists().withMessage('Should have a valid account name'),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking listVideoAccountChannelsValidator parameters', { parameters: req.body })
 
     if (areValidationErrors(req, res)) return
-    if (!await isAccountIdExist(req.params.accountId, res)) return
+    if (!await isAccountNameWithHostExist(req.params.accountName, res)) return
 
     return next()
   }
-- 
cgit v1.2.3