diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-07-18 14:17:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-18 14:17:36 +0300 |
commit | c708877ddeedfe229462c241db520e149934ad01 (patch) | |
tree | 9535112d29dff8f5d41e41ead35f0ee0d4c964a4 | |
parent | 19402f5850adcc2505533f08ed065e580f807f9c (diff) | |
parent | e2ae5d6b8e5d2b8b23ecfb48c54a7a748eb425a6 (diff) | |
download | wekan-c708877ddeedfe229462c241db520e149934ad01.tar.gz wekan-c708877ddeedfe229462c241db520e149934ad01.tar.bz2 wekan-c708877ddeedfe229462c241db520e149934ad01.zip |
Merge pull request #1785 from Akuket/devel
Bugfix : Resending invitation code.
-rw-r--r-- | client/components/settings/settingBody.js | 1 | ||||
-rw-r--r-- | models/settings.js | 29 | ||||
-rw-r--r-- | models/users.js | 8 |
3 files changed, 28 insertions, 10 deletions
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index 5995cbf1..de96c100 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -101,6 +101,7 @@ BlazeComponent.extendComponent({ // if (!err) { // TODO - show more info to user // } + this.setLoading(false); }); } diff --git a/models/settings.js b/models/settings.js index 34f693d9..308d867d 100644 --- a/models/settings.js +++ b/models/settings.js @@ -124,20 +124,33 @@ if (Meteor.isServer) { sendInvitation(emails, boards) { check(emails, [String]); check(boards, [String]); + const user = Users.findOne(Meteor.userId()); if(!user.isAdmin){ throw new Meteor.Error('not-allowed'); } emails.forEach((email) => { if (email && SimpleSchema.RegEx.Email.test(email)) { - const code = getRandomNum(100000, 999999); - InvitationCodes.insert({code, email, boardsToBeInvited: boards, createdAt: new Date(), authorId: Meteor.userId()}, function(err, _id){ - if (!err && _id) { - sendInvitationEmail(_id); - } else { - throw new Meteor.Error('invitation-generated-fail', err.message); - } - }); + // Checks if the email is already link to an account. + const userExist = Users.findOne({email}); + if (userExist){ + throw new Meteor.Error('user-exist', `The user with the email ${email} has already an account.`); + } + // Checks if the email is already link to an invitation. + const invitation = InvitationCodes.findOne({email}); + if (invitation){ + InvitationCodes.update(invitation, {$set : {boardsToBeInvited: boards}}); + sendInvitationEmail(invitation._id); + }else { + const code = getRandomNum(100000, 999999); + InvitationCodes.insert({code, email, boardsToBeInvited: boards, createdAt: new Date(), authorId: Meteor.userId()}, function(err, _id){ + if (!err && _id) { + sendInvitationEmail(_id); + } else { + throw new Meteor.Error('invitation-generated-fail', err.message); + } + }); + } } }); }, diff --git a/models/users.js b/models/users.js index 5a7fbbe5..9d859664 100644 --- a/models/users.js +++ b/models/users.js @@ -501,9 +501,13 @@ if (Meteor.isServer) { } else { user.profile = {icode: options.profile.invitationcode}; user.profile.boardView = 'board-view-lists'; - } - return user; + // Deletes the invitation code after the user was created successfully. + setTimeout(Meteor.bindEnvironment(() => { + InvitationCodes.remove({'_id': invitationCode._id}); + }), 200); + return user; + } }); } |