diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:05:26 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:05:26 +0200 |
commit | d61e6099776f9d5c011185527243d42cd53fc0ff (patch) | |
tree | 48b901a010dd6018002e3a8fc1acc309cb554ded | |
parent | fd9357a49589eb52e94b44a2eb405765b640f758 (diff) | |
parent | ad6471d3bd05b3ea50dd8699f7ac2d0adc031b06 (diff) | |
download | wekan-d61e6099776f9d5c011185527243d42cd53fc0ff.tar.gz wekan-d61e6099776f9d5c011185527243d42cd53fc0ff.tar.bz2 wekan-d61e6099776f9d5c011185527243d42cd53fc0ff.zip |
Merge branch 'fmonthel-devel' into devel
Invite user with lower case email
-rw-r--r-- | models/users.js | 5 | ||||
-rw-r--r-- | server/notifications/email.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/models/users.js b/models/users.js index 58513231..da2d02ee 100644 --- a/models/users.js +++ b/models/users.js @@ -349,7 +349,8 @@ if (Meteor.isServer) { } else { if (posAt <= 0) throw new Meteor.Error('error-user-doesNotExist'); - const email = username; + // Set in lowercase email before creating account + const email = username.toLowerCase(); username = email.substring(0, posAt); const newUserId = Accounts.createUser({ username, email }); if (!newUserId) throw new Meteor.Error('error-user-notCreated'); @@ -377,7 +378,7 @@ if (Meteor.isServer) { }; const lang = user.getLanguage(); Email.send({ - to: user.emails[0].address, + to: user.emails[0].address.toLowerCase(), from: Accounts.emailTemplates.from, subject: TAPi18n.__('email-invite-subject', params, lang), text: TAPi18n.__('email-invite-text', params, lang), diff --git a/server/notifications/email.js b/server/notifications/email.js index 551d2923..2af6381e 100644 --- a/server/notifications/email.js +++ b/server/notifications/email.js @@ -28,7 +28,7 @@ Meteor.startup(() => { try { Email.send({ - to: user.emails[0].address, + to: user.emails[0].address.toLowerCase(), from: Accounts.emailTemplates.from, subject: TAPi18n.__('act-activity-notify', {}, user.getLanguage()), text, |