fixed config validation

Author: mtrezza

src/Config.js

@@ -6,7 +6,10 @@ import AppCache from './cache';
 import SchemaCache from './Controllers/SchemaCache';
 import DatabaseController from './Controllers/DatabaseController';
 import net from 'net';
-import { IdempotencyOptions } from './Options/Definitions';
+import {
+  IdempotencyOptions,
+  FileUploadOptions,
+} from './Options/Definitions';
 
 function removeTrailingSlash(str) {
   if (!str) {
@@ -89,9 +92,7 @@ export class Config {
     }
 
     this.validateAccountLockoutPolicy(accountLockout);
-
     this.validatePasswordPolicy(passwordPolicy);
-
     this.validateFileUploadOptions(fileUpload);
 
     if (typeof revokeSessionOnPasswordReset !== 'boolean') {
@@ -247,28 +248,31 @@ export class Config {
       throw 'You cannot use emailVerifyTokenReuseIfValid without emailVerifyTokenValidityDuration';
     }
   }
+
   static validateFileUploadOptions(fileUpload) {
     if (!fileUpload) {
       fileUpload = {};
     }
-    if (
-      fileUpload.enableForAnonymousUser &&
-      typeof fileUpload.enableForAnonymousUser !== 'boolean'
-    ) {
-      throw 'enableForAnonymousUser must be a boolean value';
+    if (typeof fileUpload !== 'object' || fileUpload instanceof Array) {
+      throw 'fileUpload must be an object value.';
     }
-
-    if (fileUpload.enableForPublic && typeof fileUpload.enableForPublic !== 'boolean') {
-      throw 'enableForPublic must be a boolean value';
+    if (fileUpload.enableForAnonymousUser === undefined) {
+      fileUpload.enableForAnonymousUser = FileUploadOptions.enableForAnonymousUser.default;
+    } else if (typeof fileUpload.enableForAnonymousUser !== 'boolean') {
+      throw 'fileUpload.enableForAnonymousUser must be a boolean value.';
     }
-
-    if (
-      fileUpload.enableForAuthenticatedUser &&
-      typeof fileUpload.enableForAuthenticatedUser !== 'boolean'
-    ) {
-      throw 'enableForAuthenticatedUser must be a boolean value';
+    if (fileUpload.enableForPublic === undefined) {
+      fileUpload.enableForPublic = FileUploadOptions.enableForPublic.default;
+    } else if (typeof fileUpload.enableForPublic !== 'boolean') {
+      throw 'fileUpload.enableForPublic must be a boolean value.';
+    }
+    if (fileUpload.enableForAuthenticatedUser === undefined) {
+      fileUpload.enableForAuthenticatedUser = FileUploadOptions.enableForAuthenticatedUser.default;
+    } else if (typeof fileUpload.enableForAuthenticatedUser !== 'boolean') {
+      throw 'fileUpload.enableForAuthenticatedUser must be a boolean value.';
     }
   }
+
   static validateMasterKeyIps(masterKeyIps) {
     for (const ip of masterKeyIps) {
       if (!net.isIP(ip)) {