Improve: Remove uncessary RegExp query by email (#17654)

rodrigok · web-flow · commit bbb31339a173 · 2020-05-19T15:57:39.000-03:00
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
@@ -523,7 +523,7 @@ export class Users extends Base {
 	}
 
 	findOneByEmailAddress(emailAddress, options) {
-		const query = { 'emails.address': new RegExp(`^${ s.escapeRegExp(emailAddress) }$`, 'i') };
+		const query = { 'emails.address': String(emailAddress).trim().toLowerCase() };
 
 		return this.findOne(query, options);
 	}
diff --git a/server/methods/registerUser.js b/server/methods/registerUser.js
@@ -62,7 +62,7 @@ Meteor.methods({
 		};
 
 		// Check if user has already been imported and never logged in. If so, set password and let it through
-		const importedUser = Users.findOneByEmailAddress(s.trim(formData.email.toLowerCase()));
+		const importedUser = Users.findOneByEmailAddress(formData.email);
 		let userId;
 		if (importedUser && importedUser.importIds && importedUser.importIds.length && !importedUser.lastLogin) {
 			Accounts.setPassword(importedUser._id, userData.password);

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ export class Users extends Base {`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`findOneByEmailAddress(emailAddress, options) {`
`526`		- const query = { 'emails.address': new RegExp(`^${ s.escapeRegExp(emailAddress) }$`, 'i') };
	`526`	`+ const query = { 'emails.address': String(emailAddress).trim().toLowerCase() };`
`527`	`527`
`528`	`528`	`return this.findOne(query, options);`
`529`	`529`	`}`