1 files changed, 23 insertions, 56 deletions

diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts
index 81a60ee66..c80c86193 100644
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -61,75 +61,43 @@ function isIntOrNull (value: any) {
 
 // ---------------------------------------------------------------------------
 
-function isFileFieldValid (
-  files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[],
-  field: string,
-  optional = false
-) {
-  // Should have files
-  if (!files) return optional
-  if (isArray(files)) return optional
+function isFileValid (options: {
+  files: UploadFilesForCheck
 
-  // Should have a file
-  const fileArray = files[field]
-  if (!fileArray || fileArray.length === 0) {
-    return optional
-  }
+  maxSize: number | null
+  mimeTypeRegex: string | null
 
-  // The file should exist
-  const file = fileArray[0]
-  if (!file || !file.originalname) return false
-  return file
-}
+  field?: string
 
-function isFileMimeTypeValid (
-  files: UploadFilesForCheck,
-  mimeTypeRegex: string,
-  field: string,
-  optional = false
-) {
-  // Should have files
-  if (!files) return optional
-  if (isArray(files)) return optional
+  optional?: boolean // Default false
+}) {
+  const { files, mimeTypeRegex, field, maxSize, optional = false } = options
 
-  // 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
-
-  return new RegExp(`^${mimeTypeRegex}$`, 'i').test(file.mimetype)
-}
-
-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) {
+  const fileArray = isArray(files)
+    ? files
+    : files[field]
+
+  if (!fileArray || !isArray(fileArray) || fileArray.length === 0) {
     return optional
   }
 
-  // The file should exist
+  // The file exists
   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)
+  if (mimeTypeRegex === null) return true
+
+  return checkMimetypeRegex(file.mimetype, mimeTypeRegex)
+}
+
+function checkMimetypeRegex (fileMimeType: string, mimeTypeRegex: string) {
+  return new RegExp(`^${mimeTypeRegex}$`, 'i').test(fileMimeType)
 }
 
 // ---------------------------------------------------------------------------
@@ -204,7 +172,6 @@ export {
   areUUIDsValid,
   toArray,
   toIntArray,
-  isFileFieldValid,
-  isFileMimeTypeValid,
-  isFileValid
+  isFileValid,
+  checkMimetypeRegex
 }