(validation) deny undefined & null values only

Author: antoine92190

src/ChatWindow/ChatWindow.vue

@@ -101,12 +101,14 @@ export default {
 
 			if (Object.entries(val).length === 0) return
 
-			if (!roomsValid(val))
+			if (!roomsValid(val)) {
 				throw 'Rooms object is not valid! Must contain roomId[String, Number], roomName[String] and users[Array]'
+			}
 
 			val.users.forEach(user => {
-				if (!partcipantsValid(user))
+				if (!partcipantsValid(user)) {
 					throw 'Participants object is not valid! Must contain _id[String, Number] and username[String]'
+				}
 			})
 		},
 

src/ChatWindow/MessagesList.vue

@@ -285,8 +285,9 @@ export default {
 		},
 		messages(newVal, oldVal) {
 			newVal.forEach(message => {
-				if (!messagesValid(message))
+				if (!messagesValid(message)) {
 					throw 'Messages object is not valid! Must contain _id[String, Number], content[String, Number] and sender_id[String, Number]'
+				}
 			})
 
 			const element = this.$refs.scrollContainer

src/utils/roomValidation.js

@@ -15,7 +15,7 @@ export function roomsValid(obj) {
 				validType = true
 			}
 
-			return validType && obj.hasOwnProperty(prop.key) && obj[prop.key]
+			return validType && checkObjectValid(obj, prop.key)
 		})
 	}
 
@@ -31,7 +31,7 @@ export function partcipantsValid(obj) {
 	const validate = (obj, props) => {
 		return props.every(prop => {
 			const validType = prop.type.find(t => t === typeof obj[prop.key])
-			return validType && obj.hasOwnProperty(prop.key) && obj[prop.key]
+			return validType && checkObjectValid(obj, prop.key)
 		})
 	}
 
@@ -48,9 +48,13 @@ export function messagesValid(obj) {
 	const validate = (obj, props) => {
 		return props.every(prop => {
 			const validType = prop.type.find(t => t === typeof obj[prop.key])
-			return validType && obj.hasOwnProperty(prop.key) && obj[prop.key]
+			return validType && checkObjectValid(obj, prop.key)
 		})
 	}
 
 	return validate(obj, participantsValidate)
 }
+
+function checkObjectValid(obj, key) {
+	return obj.hasOwnProperty(key) && obj[key] !== null && obj[key] !== undefined
+}