github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow passing function predicate for domain checks

Browse Source 
Escape regexp construction
Don't use &= with Booleans
This commit is contained in:
Slava Kim
2013-10-01 17:05:17 -07:00
parent b9d8fffddf
commit 53756bd80b
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/accounts-base/accounts_server.js
View File

@@ -304,14 +304,24 @@ Accounts.validateNewUser = function (func) {
validateNewUserHooks.push(func);
};
// XXX Copied from the middle of oplog-tailing logic
// Like Perl's quotemeta: quotes all regexp metacharacters. See
// https://github.com/substack/quotemeta/blob/master/index.js
var quotemeta = function (str) {
return String(str).replace(/(\W)/g, '\\$1');
};
// Helper function: returns false if email does not match company domain from
// the configuration.
var testEmailDomain = function (email) {
var domain = Accounts._options.restrictCreationByEmail;
return !domain || (new RegExp('@' + domain + '$', 'i')).test(email);
return !domain ||
(_.isFunction(domain) && domain(email)) ||
(_.isString(domain) &&
(new RegExp('@' + quotemeta(domain) + '$', 'i')).test(email));
};
// Validate new user's email or Google/Facebook/Github account's email
// Validate new user's email or Google/Facebook/GitHub account's email
Accounts.validateNewUser(function (user) {
var domain = Accounts._options.restrictCreationByEmail;
if (!domain)
@@ -320,15 +330,17 @@ Accounts.validateNewUser(function (user) {
var emailIsGood = true;
// User with password can have only one email on creation
if (user.emails)
emailIsGood &= testEmailDomain(user.emails[0].address);
emailIsGood = emailIsGood && testEmailDomain(user.emails[0].address);
// Find any email of any service and check it
emailIsGood &= _.any(user.services, function (service) {
emailIsGood = emailIsGood && _.any(user.services, function (service) {
return service.email && testEmailDomain(service.email);
});
if (!emailIsGood)
throw new Meteor.Error(403, "@" + domain + " email required");
if (_.isString(domain))
throw new Meteor.Error(403, "@" + domain + " email required");
else throw new Meteor.Error(403, "Email doesn't match the criterias.");
return true;
});