X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fmisc.ts;h=cf32201c411a6532e6c002c88282b699657ddee7;hb=310b5219b38427f0c2c7ba57225afdd8f3064380;hp=3ef38fce1d0b135625647e24dfbbd3671d86595a;hpb=f023a19c3eeeea2b014b47fae522a62eab320048;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts index 3ef38fce1..cf32201c4 100644 --- a/server/helpers/custom-validators/misc.ts +++ b/server/helpers/custom-validators/misc.ts @@ -1,5 +1,5 @@ import 'multer' -import * as validator from 'validator' +import validator from 'validator' import { sep } from 'path' function exists (value: any) { @@ -46,9 +46,21 @@ function isBooleanValid (value: any) { } function toIntOrNull (value: string) { - if (value === 'null') return null + const v = toValueOrNull(value) + + if (v === null || v === undefined) return v + if (typeof v === 'number') return v + + return validator.toInt('' + v) +} + +function toBooleanOrNull (value: any) { + const v = toValueOrNull(value) + + if (v === null || v === undefined) return v + if (typeof v === 'boolean') return v - return validator.toInt(value) + return validator.toBoolean('' + v) } function toValueOrNull (value: string) { @@ -82,13 +94,13 @@ function isFileValid ( if (isArray(files)) return optional // Should have a file - const fileArray = files[ field ] + const fileArray = files[field] if (!fileArray || fileArray.length === 0) { return optional } // The file should exist - const file = fileArray[ 0 ] + const file = fileArray[0] if (!file || !file.originalname) return false // Check size @@ -110,6 +122,7 @@ export { isIdOrUUIDValid, isDateValid, toValueOrNull, + toBooleanOrNull, isBooleanValid, toIntOrNull, toArray,