aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares/validators/blocklist.ts
diff options
context:
space:
mode:
Diffstat (limited to 'server/middlewares/validators/blocklist.ts')
-rw-r--r--server/middlewares/validators/blocklist.ts18
1 files changed, 12 insertions, 6 deletions
diff --git a/server/middlewares/validators/blocklist.ts b/server/middlewares/validators/blocklist.ts
index 12980ced4..3de614522 100644
--- a/server/middlewares/validators/blocklist.ts
+++ b/server/middlewares/validators/blocklist.ts
@@ -13,7 +13,8 @@ import { ServerBlocklistModel } from '../../models/server/server-blocklist'
13import { areValidationErrors, doesAccountNameWithHostExist } from './shared' 13import { areValidationErrors, doesAccountNameWithHostExist } from './shared'
14 14
15const blockAccountValidator = [ 15const blockAccountValidator = [
16 body('accountName').exists().withMessage('Should have an account name with host'), 16 body('accountName')
17 .exists(),
17 18
18 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 19 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
19 logger.debug('Checking blockAccountByAccountValidator parameters', { parameters: req.body }) 20 logger.debug('Checking blockAccountByAccountValidator parameters', { parameters: req.body })
@@ -37,7 +38,8 @@ const blockAccountValidator = [
37] 38]
38 39
39const unblockAccountByAccountValidator = [ 40const unblockAccountByAccountValidator = [
40 param('accountName').exists().withMessage('Should have an account name with host'), 41 param('accountName')
42 .exists(),
41 43
42 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 44 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
43 logger.debug('Checking unblockAccountByAccountValidator parameters', { parameters: req.params }) 45 logger.debug('Checking unblockAccountByAccountValidator parameters', { parameters: req.params })
@@ -54,7 +56,8 @@ const unblockAccountByAccountValidator = [
54] 56]
55 57
56const unblockAccountByServerValidator = [ 58const unblockAccountByServerValidator = [
57 param('accountName').exists().withMessage('Should have an account name with host'), 59 param('accountName')
60 .exists(),
58 61
59 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 62 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
60 logger.debug('Checking unblockAccountByServerValidator parameters', { parameters: req.params }) 63 logger.debug('Checking unblockAccountByServerValidator parameters', { parameters: req.params })
@@ -71,7 +74,8 @@ const unblockAccountByServerValidator = [
71] 74]
72 75
73const blockServerValidator = [ 76const blockServerValidator = [
74 body('host').custom(isHostValid).withMessage('Should have a valid host'), 77 body('host')
78 .custom(isHostValid),
75 79
76 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 80 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
77 logger.debug('Checking serverGetValidator parameters', { parameters: req.body }) 81 logger.debug('Checking serverGetValidator parameters', { parameters: req.body })
@@ -96,7 +100,8 @@ const blockServerValidator = [
96] 100]
97 101
98const unblockServerByAccountValidator = [ 102const unblockServerByAccountValidator = [
99 param('host').custom(isHostValid).withMessage('Should have an account name with host'), 103 param('host')
104 .custom(isHostValid),
100 105
101 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 106 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
102 logger.debug('Checking unblockServerByAccountValidator parameters', { parameters: req.params }) 107 logger.debug('Checking unblockServerByAccountValidator parameters', { parameters: req.params })
@@ -111,7 +116,8 @@ const unblockServerByAccountValidator = [
111] 116]
112 117
113const unblockServerByServerValidator = [ 118const unblockServerByServerValidator = [
114 param('host').custom(isHostValid).withMessage('Should have an account name with host'), 119 param('host')
120 .custom(isHostValid),
115 121
116 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 122 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
117 logger.debug('Checking unblockServerByServerValidator parameters', { parameters: req.params }) 123 logger.debug('Checking unblockServerByServerValidator parameters', { parameters: req.params })