From a165cdc242fefdf8ac7045003dc9da999050d39c Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Mon, 20 Nov 2017 20:58:53 -0800
Subject: [PATCH] moved privateFields dict to constants.js

---
 app/controllers/helpers.server.controller.js | 21 ++++++++------------
 app/libs/constants.js                        |  7 +++++++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/controllers/helpers.server.controller.js b/app/controllers/helpers.server.controller.js
index f769187f..0f224a3b 100644
--- a/app/controllers/helpers.server.controller.js
+++ b/app/controllers/helpers.server.controller.js
@@ -1,14 +1,9 @@
 'use strict';
 
+const constants = require('../libs/constants');
+
 module.exports = {
 	removeSensitiveModelData: function(type, object){
-		var privateFields = {
-			'public_form': ['__v', 'analytics.visitors', 'analytics.views', 'analytics.conversionRate', 'analytics.fields', 'lastModified', 'created'],
-			'private_form': ['__v'],
-			'public_user': ['passwordHash', 'password', 'provider', 'salt', 'lastModified', 'created', 'resetPasswordToken', 'resetPasswordExpires', 'token', 'apiKey', '__v'],
-			'private_user': ['passwordHash', 'password', 'provider', 'salt', 'resetPasswordToken', 'resetPasswordExpires', 'token', '__v']
-		};
-
 		function removeKeysFromDict(dict, keys){
 			for(var i=0; i<keys.length; i++){
 				var curr_key = keys[i];
@@ -20,22 +15,22 @@ module.exports = {
 
 		switch(type){
 			case 'private_form':
-	            removeKeysFromDict(object, privateFields[type]);
+	            removeKeysFromDict(object, constants.privateFields[type]);
 	            if(object.admin){
-	            	removeKeysFromDict(object.admin, privateFields.private_user);
+	            	removeKeysFromDict(object.admin, constants.privateFields.private_user);
 	            }
 	            break;
 
 	        case 'public_form':
-				removeKeysFromDict(object, privateFields[type]);
+				removeKeysFromDict(object, constants.privateFields[type]);
 				if(object.admin){
-	            	removeKeysFromDict(object.admin, privateFields.public_user);
+	            	removeKeysFromDict(object.admin, constants.privateFields.public_user);
 	        	}
 	            break;
 
 	        default:
-	        	if(privateFields.hasOwnProperty(type)){
-	        		removeKeysFromDict(object, privateFields[type]);
+	        	if(constants.privateFields.hasOwnProperty(type)){
+	        		removeKeysFromDict(object, constants.privateFields[type]);
 	        	} 
 	            break;
 		}
diff --git a/app/libs/constants.js b/app/libs/constants.js
index 9e5d92e8..6e37d0b2 100644
--- a/app/libs/constants.js
+++ b/app/libs/constants.js
@@ -55,6 +55,13 @@ module.exports = {
 		'Deutsch': 'de'
 	},
 
+	privateFields: {
+		'public_form': ['__v', 'analytics.visitors', 'analytics.views', 'analytics.conversionRate', 'analytics.fields', 'lastModified', 'created'],
+		'private_form': ['__v'],
+		'public_user': ['passwordHash', 'password', 'provider', 'salt', 'lastModified', 'created', 'resetPasswordToken', 'resetPasswordExpires', 'token', 'apiKey', '__v'],
+		'private_user': ['passwordHash', 'password', 'provider', 'salt', 'resetPasswordToken', 'resetPasswordExpires', 'token', '__v']
+	},
+
     expressionStringTypes: 	['field == static',
 			'field != static',
 			'field > static',