X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Faccount.ts;h=e529c831d541ea575e80209a8d6f3d623848dc00;hb=3318147300b4f998adf728eb0a5a14a4c1829c51;hp=ebc2fcf2d89099c72e3effb1f36046a7301fc352;hpb=265ba139ebf56bbdc1c65f6ea4f367774c691fc0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/account.ts b/server/middlewares/validators/account.ts
index ebc2fcf2d..e529c831d 100644
--- a/server/middlewares/validators/account.ts
+++ b/server/middlewares/validators/account.ts
@@ -1,9 +1,8 @@
-import * as express from 'express'
-import { param } from 'express-validator/check'
-import { isAccountIdExist, isAccountNameValid, isLocalAccountNameExist } from '../../helpers/custom-validators/accounts'
-import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
+import express from 'express'
+import { param } from 'express-validator'
+import { isAccountNameValid } from '../../helpers/custom-validators/accounts'
 import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
+import { areValidationErrors, doesAccountNameWithHostExist, doesLocalAccountNameExist } from './shared'
 
 const localAccountValidator = [
   param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'),
@@ -12,20 +11,20 @@ const localAccountValidator = [
     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(isIdOrUUIDValid).withMessage('Should have a valid id'),
+const accountNameWithHostGetValidator = [
+  param('accountName').exists().withMessage('Should have an account name with host'),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking accountsGetValidator parameters', { parameters: req.params })
+    logger.debug('Checking accountsNameWithHostGetValidator parameters', { parameters: req.params })
 
     if (areValidationErrors(req, res)) return
-    if (!await isAccountIdExist(req.params.id, res)) return
+    if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return
 
     return next()
   }
@@ -35,5 +34,5 @@ const accountsGetValidator = [
 
 export {
   localAccountValidator,
-  accountsGetValidator
+  accountNameWithHostGetValidator
 }