Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade express and express-validator

Browse Source
This commit is contained in:
Phillip Thelen
2025-09-04 11:39:36 +02:00
parent 0b4adbbf07
commit 6092cba1ea
35 changed files with 351 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/server/controllers/api-v4/admin.js
+13 -12
View File
@@ -1,5 +1,6 @@
import validator from 'validator';
import merge from 'lodash/merge';
import { param , validationResult } from 'express-validator';
import uniqBy from 'lodash/uniqBy';
import { v4 as uuid } from 'uuid';
import { authWithHeaders } from '../../middlewares/auth';
@@ -41,10 +42,10 @@ api.searchHero = {
url: '/admin/search/:userIdentifier',
middlewares: [authWithHeaders(), ensurePermission('userSupport')],
async handler (req, res) {
req.checkParams('userIdentifier', res.t('userIdentifierRequired')).notEmpty();
await param('userIdentifier', res.t('userIdentifierRequired')).notEmpty().run(req)
const validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
const validationErrors = validationResult(req).array();
if (validationErrors && validationErrors.length > 0) throw validationErrors;
const { userIdentifier } = req.params;
@@ -109,10 +110,10 @@ api.getUserHistory = {
url: '/admin/user/:userId/history',
middlewares: [authWithHeaders(), ensurePermission('userSupport')],
async handler (req, res) {
req.checkParams('userId', res.t('heroIdRequired')).notEmpty().isUUID();
await param('userId', res.t('heroIdRequired')).notEmpty().isUUID().run(req)
const validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
const validationErrors = validationResult(req).array();
if (validationErrors && validationErrors.length > 0) throw validationErrors;
const { userId } = req.params;
@@ -161,10 +162,10 @@ api.updateBlocker = {
url: '/admin/blockers/:blockerId',
middlewares: [authWithHeaders(), ensurePermission('accessControl')],
async handler (req, res) {
req.checkParams('blockerId', res.t('blockerIdRequired')).notEmpty().isUUID();
await param('blockerId', res.t('blockerIdRequired')).notEmpty().isUUID().run(req)
const validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
const validationErrors = validationResult(req).array();
if (validationErrors && validationErrors.length > 0) throw validationErrors;
const blocker = await Blocker.findById(req.params.blockerId).exec();
if (!blocker) throw new NotFound(res.t('blockerNotFound'));
@@ -181,10 +182,10 @@ api.deleteBlocker = {
url: '/admin/blockers/:blockerId',
middlewares: [authWithHeaders(), ensurePermission('accessControl')],
async handler (req, res) {
req.checkParams('blockerId', res.t('blockerIdRequired')).notEmpty().isUUID();
await param('blockerId', res.t('blockerIdRequired')).notEmpty().isUUID().run(req)
const validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
const validationErrors = validationResult(req).array();
if (validationErrors && validationErrors.length > 0) throw validationErrors;
const blocker = await Blocker.findById(req.params.blockerId).exec();
if (!blocker) throw new NotFound(res.t('blockerNotFound'));