[FIX] Check settings for name requirement before validating

app/lib/server/functions/saveUser.js

@@ -50,7 +50,7 @@ function validateUserData(userId, userData) {
 		});
 	}
 
-	if (!userData._id && !s.trim(userData.name)) {
+	if (settings.get('Accounts_RequireNameForSignUp') && !userData._id && !s.trim(userData.name)) {
 		throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', {
 			method: 'insertOrUpdateUser',
 			field: 'Name',
@@ -173,12 +173,15 @@ export const saveUser = function(userId, userData) {
 
 		const updateUser = {
 			$set: {
-				name: userData.name,
 				roles: userData.roles || ['user'],
 				settings: userData.settings || {},
 			},
 		};
 
+		if (typeof userData.name !== 'undefined') {
+			updateUser.$set.name = userData.name;
+		}
+
 		if (typeof userData.requirePasswordChange !== 'undefined') {
 			updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
 		}
@@ -198,12 +201,15 @@ export const saveUser = function(userId, userData) {
 				subject,
 				html,
 				data: {
-					name: s.escapeHTML(userData.name),
 					email: s.escapeHTML(userData.email),
 					password: s.escapeHTML(userData.password),
 				},
 			};
 
+			if (typeof userData.name !== 'undefined') {
+				email.data.name = s.escapeHTML(userData.name);
+			}
+
 			try {
 				Mailer.send(email);
 			} catch (error) {
@@ -236,9 +242,7 @@ export const saveUser = function(userId, userData) {
 		setUsername(userData._id, userData.username);
 	}
 
-	if (userData.name) {
-		setRealName(userData._id, userData.name);
-	}
+	setRealName(userData._id, userData.name);
 
 	if (userData.email) {
 		const shouldSendVerificationEmailToUser = userData.verified !== true;

app/lib/server/functions/setRealName.js

@@ -8,19 +8,24 @@ import s from 'underscore.string';
 
 export const _setRealName = function(userId, name) {
 	name = s.trim(name);
-	if (!userId || !name) {
+
+	if (!userId || (settings.get('Accounts_RequireNameForSignUp') && !name)) {
 		return false;
 	}
 
 	const user = Users.findOneById(userId);
 
 	// User already has desired name, return
-	if (user.name === name) {
+	if (s.trim(user.name) === name) {
 		return user;
 	}
 
 	// Set new name
-	Users.setName(user._id, name);
+	if (name) {
+		Users.setName(user._id, name);
+	} else {
+		Users.unsetName(user._id);
+	}
 	user.name = name;
 
 	// if user has no username, there is no need to updated any direct messages (there is none)

app/models/server/models/Subscriptions.js

@@ -1188,11 +1188,20 @@ export class Subscriptions extends Base {
 			name,
 		};
 
-		const update = {
-			$set: {
-				fname,
-			},
-		};
+		let update;
+		if (fname) {
+			update = {
+				$set: {
+					fname,
+				},
+			};
+		} else {
+			update = {
+				$unset: {
+					fname: true,
+				},
+			};
+		}
 
 		return this.update(query, update, { multi: true });
 	}

app/models/server/models/Users.js

@@ -741,6 +741,16 @@ export class Users extends Base {
 		return this.update(_id, update);
 	}
 
+	unsetName(_id) {
+		const update = {
+			$unset: {
+				name,
+			},
+		};
+
+		return this.update(_id, update);
+	}
+
 	setCustomFields(_id, fields) {
 		const values = {};
 		Object.keys(fields).forEach((key) => {

app/ui-flextab/client/tabs/userEdit.js

@@ -6,6 +6,7 @@ import { TAPi18n } from 'meteor/tap:i18n';
 import { t, handleError } from '../../../utils';
 import { Roles } from '../../../models';
 import { hasAtLeastOnePermission } from '../../../authorization';
+import { settings } from '../../../settings';
 import toastr from 'toastr';
 import s from 'underscore.string';
 
@@ -136,7 +137,7 @@ Template.userEdit.onCreated(function() {
 		const userData = this.getUserData();
 
 		const errors = [];
-		if (!userData.name) {
+		if (settings.get('Accounts_RequireNameForSignUp') && !userData.name) {
 			errors.push('Name');
 		}
 		if (!userData.username) {