1 files changed, 48 insertions, 36 deletions

diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts
index 229e9f03c..528bfcfb8 100644
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -2,6 +2,7 @@ import 'multer'
 import { UploadFilesForCheck } from 'express'
 import { sep } from 'path'
 import validator from 'validator'
+import { isShortUUID, shortToUUID } from '../uuid'
 
 function exists (value: any) {
   return value !== undefined && value !== null
@@ -50,42 +51,7 @@ function isIntOrNull (value: any) {
   return value === null || validator.isInt('' + value)
 }
 
-function toIntOrNull (value: string) {
-  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.toBoolean('' + v)
-}
-
-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 isFileFieldValid (
   files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[],
@@ -160,6 +126,51 @@ function isFileValid (
 
 // ---------------------------------------------------------------------------
 
+function toCompleteUUID (value: string) {
+  if (isShortUUID(value)) return shortToUUID(value)
+
+  return value
+}
+
+function toIntOrNull (value: string) {
+  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.toBoolean('' + v)
+}
+
+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))
+}
+
+// ---------------------------------------------------------------------------
+
 export {
   exists,
   isArrayOf,
@@ -169,6 +180,7 @@ export {
   isIdValid,
   isSafePath,
   isUUIDValid,
+  toCompleteUUID,
   isIdOrUUIDValid,
   isDateValid,
   toValueOrNull,