From bcdc79e89752e4e944b19b6be6203c11108029ac Mon Sep 17 00:00:00 2001
From: matt <matt@fiddaman.net>
Date: Sat, 19 Feb 2022 21:11:16 +0000
Subject: [PATCH] Refactored sanitisation function to allow more expandability
 and removed the need to clone the body

---
 lib/__tests__/validator.test.js | 18 ++++++++++++++++++
 lib/validator.js                | 33 ++++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/lib/__tests__/validator.test.js b/lib/__tests__/validator.test.js
index ca75b39..ace2c7f 100644
--- a/lib/__tests__/validator.test.js
+++ b/lib/__tests__/validator.test.js
@@ -118,6 +118,24 @@ describe('validate', () => {
 		}).toThrow('missing');
 	});
 
+	test('Unrequired fields added to map', () => {
+		const body = {
+			name: 'Bob',
+			message: 'Hi Jim!    '
+		};
+
+		const fields = [
+			'name',
+		];
+
+		const result = validator.validate(body, fields);
+
+		expect(result).toBeObject();
+		expect(result).toContainKey('fields');
+		expect(result.fields.get('name')).toBe('Bob');
+		expect(result.fields.get('message')).toBe('Hi Jim!');
+	});
+
 	test('Valid email validation', () => {
 		const body = {
 			name: 'Bob',
diff --git a/lib/validator.js b/lib/validator.js
index 30d692a..857e2ee 100644
--- a/lib/validator.js
+++ b/lib/validator.js
@@ -30,6 +30,21 @@ function passwordsMatch(password1, password2) {
 	return password1 === password2;
 }
 
+/*
+ * sanitiseField() Return a clean version of a given string
+ *
+ * @param {string} field - The field to be sanitised
+ *
+ * @return {string} - The sanitisied field
+ */
+function sanitiseField(field) {
+	let cleanField;
+
+	cleanField = field.trim();
+
+	return cleanField;
+}
+
 /**
  * validate() Main validation wrapper function to validate full POST form body
  *
@@ -40,25 +55,21 @@ function passwordsMatch(password1, password2) {
  * @return {Object} results
  * @return {Map<string, string>} results.fields - Sanitised and validated fields
  */
-function validate(originalBody, fields, validation = {}) {
-	const body = { ...originalBody };
+function validate(body, fields, validation = {}) {
 	const fieldsMap = new Map();
 
-	// Check all required fields are not empty, and sanitise them
+	// Sanitise all fields
+	for (const [ field, content ] of Object.entries(body))
+		fieldsMap.set(field, sanitiseField(content));
+
+	// Check all required fields are not empty
 	for (const field of fields) {
-		const cleanField = body[field]?.trim() ?? false;
+		const cleanField = fieldsMap.get(field) ?? false;
 
 		if (cleanField === false || cleanField.length < 1)
 			throw new Error(`${field} is missing`);
-
-		fieldsMap.set(field, cleanField);
-
-		delete body[field];
 	}
 
-	for (const [ field, content ] of Object.entries(body))
-		fieldsMap.set(field, content);
-
 	// Handle validation as required in options
 	for (const [ check, checkOpts ] of Object.entries(validation)) {
 		let valid;