X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Faccount.ts;h=551f67d61fb68dc8d0a506b9cdddfe275dca7ef9;hb=e364e31e25bd1d4b8d801c845a96d6be708f0a18;hp=c01e742da3b478bf5ed42ca00505c71da9e56294;hpb=d14a9532a1363b464d6d15fce86afc4983a8357e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/account.ts b/server/middlewares/validators/account.ts
index c01e742da..551f67d61 100644
--- a/server/middlewares/validators/account.ts
+++ b/server/middlewares/validators/account.ts
@@ -1,55 +1,27 @@
-import * as express from 'express'
-import { param } from 'express-validator/check'
-import {
-  isAccountIdExist,
-  isAccountIdValid,
-  isAccountNameValid,
-  isAccountNameWithHostExist,
-  isLocalAccountNameExist
-} from '../../helpers/custom-validators/accounts'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
-import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
+import express from 'express'
+import { param } from 'express-validator'
+import { isAccountNameValid } from '../../helpers/custom-validators/accounts'
+import { areValidationErrors, doesAccountNameWithHostExist, doesLocalAccountNameExist } from './shared'
 
 const localAccountValidator = [
-  param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'),
+  param('name')
+    .custom(isAccountNameValid),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking localAccountValidator parameters', { parameters: req.params })
-
     if (areValidationErrors(req, res)) return
-    if (!await isLocalAccountNameExist(req.params.name, res)) return
+    if (!await doesLocalAccountNameExist(req.params.name, res)) return
 
     return next()
   }
 ]
 
-const accountsGetValidator = [
-  param('id').custom(isAccountIdValid).withMessage('Should have a valid id/uuid/name/name with host'),
+const accountNameWithHostGetValidator = [
+  param('accountName')
+    .exists(),
 
   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'),
-
-  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 doesAccountNameWithHostExist(req.params.accountName, res)) return
 
     return next()
   }
@@ -59,6 +31,5 @@ const accountsNameWithHostGetValidator = [
 
 export {
   localAccountValidator,
-  accountsGetValidator,
-  accountsNameWithHostGetValidator
+  accountNameWithHostGetValidator
 }