Skip to content

Fix 1 for Connect issue 2741 invite existent user #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2019
Merged

Fix 1 for Connect issue 2741 invite existent user #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa2fd52
fix for inviting existent users
maxceem Jan 15, 2019
a499d04
Merge branch 'dev' into connect-issue-2741-invite-existent-user
maxceem Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
230 changes: 123 additions & 107 deletions src/routes/projectMemberInvites/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,70 @@ const addMemberValidations = {
},
};

/**
* Helper method to build promises for creating new invites in DB
*
* @param {Object} req express request object
* @param {Object} invite invite to process
* @param {Array} invites existent invites from DB
* @param {Object} data template for new invites to be put in DB
*
* @returns {Promise<Promise[]>} list of promises
*/
const buildCreateInvitePromises = (req, invite, invites, data) => {
const invitePromises = [];

if (invite.userIds) {
// remove invites for users that are invited already
_.remove(invite.userIds, u => _.some(invites, i => i.userId === u));
invite.userIds.forEach((userId) => {
const dataNew = _.clone(data);

dataNew.userId = userId;

invitePromises.push(models.ProjectMemberInvite.create(dataNew));
});
}

if (invite.emails) {
// if for some emails there are already existent users, we will invite them by userId,
// to avoid sending them registration email
return util.lookupUserEmails(req, invite.emails)
.then((existentUsers) => {
// for existent users - invite by ids
const existentUserIds = existentUsers.map(user => parseInt(user.id, 10));
// the rest of email of non-existent users, so we will invite them by email
const nonExistentUserEmails = invite.emails.filter(inviteEmail =>
!_.find(existentUsers, { email: inviteEmail }),
);

// remove invites for users that are invited already
_.remove(existentUserIds, userId => _.some(invites, i => i.userId === userId));
existentUserIds.forEach((userId) => {
const dataNew = _.clone(data);

dataNew.userId = userId;

invitePromises.push(models.ProjectMemberInvite.create(dataNew));
});

// remove invites for users that are invited already
_.remove(nonExistentUserEmails, email => _.some(invites, i => i.email === email));
nonExistentUserEmails.forEach((email) => {
const dataNew = _.clone(data);

dataNew.email = email;

invitePromises.push(models.ProjectMemberInvite.create(dataNew));
});

return Promise.resolve(invitePromises);
});
}

return Promise.resolve(invitePromises);
};

module.exports = [
// handles request validations
validate(addMemberValidations),
Expand Down Expand Up @@ -103,120 +167,72 @@ module.exports = [
createdBy: req.authUser.userId,
updatedBy: req.authUser.userId,
};
const invitePromises = [];
if (invite.userIds) {
// remove invites for users that are invited already
_.remove(invite.userIds, u => _.some(invites, i => i.userId === u));
invite.userIds.forEach((userId) => {
const dataNew = _.clone(data);
_.assign(dataNew, {
userId,
});
invitePromises.push(models.ProjectMemberInvite.create(dataNew));
});
}
data.userId = null;

if (invite.emails) {
// if for some emails there are already existent users, we will invite them by userId,
// to avoid sending them registration email
const existentUsers = util.lookupUserEmails(req, invite.emails).map((user) => {
const userWithNumberId = {};
_.assign(userWithNumberId, user, {
id: parseInt(user.id, 10),
});
return userWithNumberId;
});
// for existent users - invite by ids
const existentUserIds = _.map(existentUsers, 'id');
// the rest of email of non-existent users, so we will invite them by email
const nonExistentUserEmails = invite.emails.filter(inviteEmail =>
!_.find(existentUsers, { email: inviteEmail }),
);

// remove invites for users that are invited already
_.remove(existentUserIds, userId => _.some(invites, i => i.userId === userId));
existentUserIds.forEach((userId) => {
const dataNew = _.clone(data);
_.assign(dataNew, {
userId,
});
invitePromises.push(models.ProjectMemberInvite.create(dataNew));
});

// remove invites for users that are invited already
_.remove(nonExistentUserEmails, email => _.some(invites, i => i.email === email));
nonExistentUserEmails.forEach((email) => {
const dataNew = _.clone(data);
_.assign(dataNew, {
email,
});
invitePromises.push(models.ProjectMemberInvite.create(dataNew));
});
}

if (invitePromises.length === 0) {
return [];
}

req.log.debug('Creating invites');
const emailEventType = BUS_API_EVENT.PROJECT_MEMBER_EMAIL_INVITE_CREATED;
return models.sequelize.Promise.all(invitePromises)
.then((values) => {
values.forEach((v) => {
req.app.emit(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED, {
req,
userId: v.userId,
email: v.email,
});
req.app.services.pubsub.publish(
EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED,
v,
{ correlationId: req.id },
);
// send email invite (async)
if (v.email) {
models.Project
.find({
where: { id: projectId },
raw: true,
})
.then((_project) => {
createEvent(emailEventType,
{
data: {
connectURL: config.get('connectUrl'),
accountsAppURL: config.get('accountsAppUrl'),
subject: config.get('inviteEmailSubject'),
projects: [
{
name: _project.name,
projectId,
sections: [
return buildCreateInvitePromises(req, invite, invites, data)
.then((invitePromises) => {
if (invitePromises.length === 0) {
return [];
}

req.log.debug('Creating invites');
const emailEventType = BUS_API_EVENT.PROJECT_MEMBER_EMAIL_INVITE_CREATED;
return models.sequelize.Promise.all(invitePromises)
.then((values) => {
values.forEach((v) => {
req.app.emit(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED, {
req,
userId: v.userId,
email: v.email,
});
req.app.services.pubsub.publish(
EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED,
v,
{ correlationId: req.id },
);
// send email invite (async)
if (v.email) {
models.Project
.find({
where: { id: projectId },
raw: true,
})
.then((_project) => {
createEvent(emailEventType,
{
data: {
connectURL: config.get('connectUrl'),
accountsAppURL: config.get('accountsAppUrl'),
subject: config.get('inviteEmailSubject'),
projects: [
{
EMAIL_INVITES: true,
title: config.get('inviteEmailSectionTitle'),
projectName: _project.name,
name: _project.name,
projectId,
sections: [
{
EMAIL_INVITES: true,
title: config.get('inviteEmailSectionTitle'),
projectName: _project.name,
projectId,
},
],
},
],
},
],
},
recipients: [v.email],
version: 'v3',
from: {
name: config.get('EMAIL_INVITE_FROM_NAME'),
email: config.get('EMAIL_INVITE_FROM_EMAIL'),
},
categories: [`${process.env.NODE_ENV}:${emailEventType}`.toLowerCase()],
}, req.log);
recipients: [v.email],
version: 'v3',
from: {
name: config.get('EMAIL_INVITE_FROM_NAME'),
email: config.get('EMAIL_INVITE_FROM_EMAIL'),
},
categories: [`${process.env.NODE_ENV}:${emailEventType}`.toLowerCase()],
}, req.log);
});
}
});
}
});
return values;
});
});
return values;
}); // models.sequelize.Promise.all
}); // buildCreateInvitePromises
}); // models.ProjectMemberInvite.getPendingInvitesForProject
})
.then(values => res.status(201).json(util.wrapResponse(req.id, values, null, 201)))
.catch(err => next(err));
Expand Down
6 changes: 3 additions & 3 deletions src/routes/projectMemberInvites/create.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe('Project Member Invite create', () => {
sinon.stub(server.services.pubsub, 'init', () => {});
sinon.stub(server.services.pubsub, 'publish', () => {});
// by default mock lookupUserEmails return nothing so all the cases are not broken
sandbox.stub(util, 'lookupUserEmails', () => []);
sandbox.stub(util, 'lookupUserEmails', () => Promise.resolve([]));
});
afterEach(() => {
sandbox.restore();
Expand Down Expand Up @@ -296,10 +296,10 @@ describe('Project Member Invite create', () => {
});
sandbox.stub(util, 'getHttpClient', () => mockHttpClient);
util.lookupUserEmails.restore();
sandbox.stub(util, 'lookupUserEmails', () => [{
sandbox.stub(util, 'lookupUserEmails', () => Promise.resolve([{
id: '12345',
email: 'hello@world.com',
}]);
}]));
request(server)
.post(`/v4/projects/${project2.id}/members/invite`)
.set({
Expand Down