X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fusers.ts;h=56bc10b16eb624a8e9481bc49f3669b339611e48;hb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;hp=8d6247e41d9461837db608f9d5299fd41272fb4f;hpb=bee0abffff73804d816b90c7fd599e0a51c09d61;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts index 8d6247e41..56bc10b16 100644 --- a/server/helpers/custom-validators/users.ts +++ b/server/helpers/custom-validators/users.ts @@ -1,8 +1,8 @@ import 'express-validator' import * as validator from 'validator' import { UserRole } from '../../../shared' -import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers' -import { exists, isFileValid, isBooleanValid } from './misc' +import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants' +import { exists, isBooleanValid, isFileValid } from './misc' import { values } from 'lodash' const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS @@ -33,15 +33,31 @@ function isUserDescriptionValid (value: string) { return value === null || (exists(value) && validator.isLength(value, CONSTRAINTS_FIELDS.USERS.DESCRIPTION)) } +function isUserEmailVerifiedValid (value: any) { + return isBooleanValid(value) +} + const nsfwPolicies = values(NSFW_POLICY_TYPES) function isUserNSFWPolicyValid (value: any) { return exists(value) && nsfwPolicies.indexOf(value) !== -1 } +function isUserWebTorrentEnabledValid (value: any) { + return isBooleanValid(value) +} + +function isUserVideosHistoryEnabledValid (value: any) { + return isBooleanValid(value) +} + function isUserAutoPlayVideoValid (value: any) { return isBooleanValid(value) } +function isUserAdminFlagsValid (value: any) { + return exists(value) && validator.isInt('' + value) +} + function isUserBlockedValid (value: any) { return isBooleanValid(value) } @@ -65,6 +81,7 @@ function isAvatarFile (files: { [ fieldname: string ]: Express.Multer.File[] } | // --------------------------------------------------------------------------- export { + isUserVideosHistoryEnabledValid, isUserBlockedValid, isUserPasswordValid, isUserBlockedReasonValid, @@ -72,7 +89,10 @@ export { isUserVideoQuotaValid, isUserVideoQuotaDailyValid, isUserUsernameValid, + isUserAdminFlagsValid, + isUserEmailVerifiedValid, isUserNSFWPolicyValid, + isUserWebTorrentEnabledValid, isUserAutoPlayVideoValid, isUserDisplayNameValid, isUserDescriptionValid,