X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fmisc.ts;h=3a3deab0c8f7b152ac56d08348d003b84286c247;hb=1eddc9a74f9a80fa5d0cb25fceb3fc47a1a3c14a;hp=3903884eadbe410de35c289626ea6752c259d1ad;hpb=47564bbe2eeb2baae9b7e3f9b2b8d16522bc7e04;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts index 3903884ea..3a3deab0c 100644 --- a/server/helpers/custom-validators/misc.ts +++ b/server/helpers/custom-validators/misc.ts @@ -1,3 +1,4 @@ +import 'multer' import * as validator from 'validator' function exists (value: any) { @@ -8,6 +9,14 @@ function isArray (value: any) { return Array.isArray(value) } +function isNotEmptyIntArray (value: any) { + return Array.isArray(value) && value.every(v => validator.isInt('' + v)) && value.length !== 0 +} + +function isArrayOf (value: any, validator: (value: any) => boolean) { + return isArray(value) && value.every(v => validator(v)) +} + function isDateValid (value: string) { return exists(value) && validator.isISO8601(value) } @@ -24,18 +33,77 @@ function isIdOrUUIDValid (value: string) { return isIdValid(value) || isUUIDValid(value) } -function isBooleanValid (value: string) { +function isBooleanValid (value: any) { return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value)) } +function toIntOrNull (value: string) { + if (value === 'null') return null + + return validator.toInt(value) +} + +function toValueOrNull (value: string) { + if (value === 'null') return null + + return value +} + +function toArray (value: any) { + if (value && isArray(value) === false) return [ value ] + + return value +} + +function toIntArray (value: any) { + if (!value) return [] + if (isArray(value) === false) return [ validator.toInt(value) ] + + return value.map(v => validator.toInt(v)) +} + +function isFileValid ( + files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], + mimeTypeRegex: string, + field: string, + maxSize: number | null, + optional = false +) { + // Should have files + if (!files) return optional + if (isArray(files)) return optional + + // Should have a file + const fileArray = files[ field ] + if (!fileArray || fileArray.length === 0) { + return optional + } + + // The file should exist + const file = fileArray[ 0 ] + if (!file || !file.originalname) return false + + // Check size + if ((maxSize !== null) && file.size > maxSize) return false + + return new RegExp(`^${mimeTypeRegex}$`, 'i').test(file.mimetype) +} + // --------------------------------------------------------------------------- export { exists, + isArrayOf, + isNotEmptyIntArray, isArray, isIdValid, isUUIDValid, isIdOrUUIDValid, isDateValid, - isBooleanValid + toValueOrNull, + isBooleanValid, + toIntOrNull, + toArray, + toIntArray, + isFileValid }