Skip to content

Commit 96a3855

Browse files
gets0ulgets0ul
committed
Fixes after feedback.
1 parent e770e25 commit 96a3855

File tree

7 files changed

+29
-81
lines changed

7 files changed

+29
-81
lines changed

‎src/routes/projectMemberInvites/create.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ module.exports = [
397397
.then((values) => {
398398
const response = _.assign({}, { success: util.postProcessInvites('$[*]', values, req) });
399399
if (failed.length) {
400-
res.status(403).json(_.assign({}, response, { failed: util.postProcessInvites('$[*]', failed, req) }));
400+
res.status(403).json(_.assign({}, response, { failed }));
401401
} else {
402402
res.status(201).json(response);
403403
}

‎src/routes/projectMemberInvites/create.spec.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ describe('Project Member Invite create', () => {
393393
should.exist(resJson);
394394
resJson.role.should.equal('customer');
395395
resJson.projectId.should.equal(project2.id);
396-
resJson.email.should.equal('h***o@w***d.com');
396+
resJson.email.should.equal('hello@world.com');
397397
resJson.hashEmail.should.equal(md5('hello@world.com'));
398398
server.services.pubsub.publish.calledWith('project.member.invite.created').should.be.true;
399399
done();
@@ -495,6 +495,8 @@ describe('Project Member Invite create', () => {
495495
resJson.role.should.equal('customer');
496496
resJson.projectId.should.equal(project2.id);
497497
resJson.userId.should.equal(40051331);
498+
should.not.exist(resJson.email);
499+
should.not.exist(resJson.hashEmail);
498500
server.services.pubsub.publish.calledWith('project.member.invite.created').should.be.true;
499501
done();
500502
}
@@ -563,7 +565,7 @@ describe('Project Member Invite create', () => {
563565
} else {
564566
const resJson = res.body.failed;
565567
should.exist(resJson);
566-
resJson[0].email.should.equal('r***y@r***o.com');
568+
resJson[0].email.should.equal('romit.choudhary@rivigo.com');
567569
resJson[0].message.should.equal('User with such email is already a member of the team.');
568570
resJson.length.should.equal(1);
569571
server.services.pubsub.publish.neverCalledWith('project.member.invite.created').should.be.true;
@@ -802,7 +804,7 @@ describe('Project Member Invite create', () => {
802804
} else {
803805
const resJson = res.body.failed;
804806
should.exist(resJson);
805-
resJson[0].email.should.equal('d***e@t***t.com');
807+
resJson[0].email.should.equal('duplicate_lowercase@test.com');
806808
resJson[0].message.should.equal('User with such email is already invited to this project.');
807809
resJson.length.should.equal(1);
808810
done();
@@ -828,7 +830,7 @@ describe('Project Member Invite create', () => {
828830
} else {
829831
const resJson = res.body.failed;
830832
should.exist(resJson);
831-
resJson[0].email.should.equal('D***E@t***t.com'); // email is masked
833+
resJson[0].email.should.equal('DUPLICATE_UPPERCASE@test.com');
832834
resJson[0].message.should.equal('User with such email is already invited to this project.');
833835
resJson.length.should.equal(1);
834836
done();

‎src/routes/projectMemberInvites/get.spec.js

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,6 @@ describe('GET Project Member Invite', () => {
8080
}).then((p) => {
8181
project2 = p;
8282

83-
// create members
84-
const pm2 = models.ProjectMember.create({
85-
userId: testUtil.userIds.romit,
86-
projectId: project2.id,
87-
role: 'copilot',
88-
isPrimary: true,
89-
createdBy: 1,
90-
updatedBy: 1,
91-
});
9283
// create invite 3
9384
const invite3 = models.ProjectMemberInvite.create({
9485
id: 3,
@@ -113,7 +104,7 @@ describe('GET Project Member Invite', () => {
113104
status: INVITE_STATUS.ACCEPTED,
114105
});
115106

116-
return Promise.all([pm2, invite3, invite4]);
107+
return Promise.all([invite3, invite4]);
117108
});
118109
return Promise.all([p1, p2])
119110
.then(() => done());
@@ -215,7 +206,8 @@ describe('GET Project Member Invite', () => {
215206
const resJson = res.body;
216207
should.exist(resJson);
217208
should.exist(resJson.projectId);
218-
should.not.exist(resJson.email);
209+
should.not.exist(resJson.email);
210+
should.not.exist(resJson.hashEmail);
219211
resJson.id.should.be.eql(2);
220212
resJson.userId.should.be.eql(testUtil.userIds.copilot);
221213
resJson.status.should.be.eql(INVITE_STATUS.PENDING);
@@ -240,35 +232,12 @@ describe('GET Project Member Invite', () => {
240232
should.exist(resJson);
241233
should.exist(resJson.projectId);
242234
resJson.id.should.be.eql(3);
243-
resJson.email.should.be.eql('test@topcoder.com');
235+
resJson.email.should.be.eql('t***t@t***r.com'); // masked
244236
resJson.hashEmail.should.be.eql(md5('test@topcoder.com'));
245237
resJson.status.should.be.eql(INVITE_STATUS.PENDING);
246238
done();
247239
}
248240
});
249241
});
250-
251-
it('should return the invite with masked email if user get not his/her own invitation by email', (done) => {
252-
request(server)
253-
.get(`/v5/projects/${project2.id}/invites/3`)
254-
.set({
255-
Authorization: `Bearer ${testUtil.jwts.romit}`,
256-
})
257-
.expect('Content-Type', /json/)
258-
.expect(200)
259-
.end((err, res) => {
260-
if (err) {
261-
done(err);
262-
} else {
263-
const resJson = res.body;
264-
should.exist(resJson);
265-
should.exist(resJson.projectId);
266-
resJson.id.should.be.eql(3);
267-
resJson.email.should.be.eql('t***t@t***r.com');
268-
resJson.status.should.be.eql(INVITE_STATUS.PENDING);
269-
done();
270-
}
271-
});
272-
});
273242
});
274243
});

‎src/routes/projectMemberInvites/list.spec.js

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,6 @@ describe('GET Project Member Invites', () => {
8181
}).then((p) => {
8282
project2 = p;
8383

84-
// create members
85-
const pm2 = models.ProjectMember.create({
86-
userId: testUtil.userIds.romit,
87-
projectId: project2.id,
88-
role: 'copilot',
89-
isPrimary: true,
90-
createdBy: 1,
91-
updatedBy: 1,
92-
});
93-
9484
// create invite 3
9585
const invite3 = models.ProjectMemberInvite.create({
9686
id: 3,
@@ -115,7 +105,7 @@ describe('GET Project Member Invites', () => {
115105
status: INVITE_STATUS.ACCEPTED,
116106
});
117107

118-
return Promise.all([pm2, invite3, invite4]);
108+
return Promise.all([invite3, invite4]);
119109
});
120110
return Promise.all([p1, p2])
121111
.then(() => done());
@@ -264,31 +254,7 @@ describe('GET Project Member Invites', () => {
264254
resJson.length.should.be.eql(1);
265255
// check invitations
266256
_.filter(resJson, inv => inv.id === 3).length.should.be.eql(1);
267-
resJson[0].email.should.be.eql('test@topcoder.com');
268-
done();
269-
}
270-
});
271-
});
272-
273-
it('should return the invite with masked email if user get not his/her own invitation by email', (done) => {
274-
request(server)
275-
.get(`/v5/projects/${project2.id}/invites`)
276-
.set({
277-
Authorization: `Bearer ${testUtil.jwts.romit}`,
278-
})
279-
.expect('Content-Type', /json/)
280-
.expect(200)
281-
.end((err, res) => {
282-
if (err) {
283-
done(err);
284-
} else {
285-
const resJson = res.body;
286-
should.exist(resJson);
287-
resJson.should.be.an('array');
288-
resJson.length.should.be.eql(1);
289-
// check invitations
290-
_.filter(resJson, inv => inv.id === 3).length.should.be.eql(1);
291-
resJson[0].email.should.be.eql('t***t@t***r.com');
257+
resJson[0].email.should.be.eql('t***t@t***r.com'); // masked
292258
done();
293259
}
294260
});

‎src/routes/projects/list.spec.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ const data = [
6464
email: 'test@topcoder.com',
6565
status: 'pending',
6666
},
67+
{
68+
id: 2,
69+
email: 'hello@world.com',
70+
status: 'pending',
71+
createdBy: 1,
72+
},
6773
],
6874
phases: [
6975

@@ -173,8 +179,8 @@ describe('LIST Project', () => {
173179
let project1;
174180
let project2;
175181
let project3;
176-
before((done) => {
177-
// this.timeout(10000);
182+
before(function inner(done) {
183+
this.timeout(10000);
178184
testUtil.clearDb()
179185
.then(() => testUtil.clearES())
180186
.then(() => {
@@ -1074,9 +1080,10 @@ describe('LIST Project', () => {
10741080
should.exist(resJson);
10751081
resJson.should.have.lengthOf(1);
10761082
resJson[0].name.should.equal('test1');
1077-
resJson[0].invites.should.have.lengthOf(1);
1083+
resJson[0].invites.should.have.lengthOf(2);
10781084
resJson[0].invites[0].should.have.property('userId');
10791085
should.not.exist(resJson[0].invites[0].email);
1086+
resJson[0].invites[1].email.should.equal('h***o@w***d.com');
10801087
done();
10811088
}
10821089
});

‎src/util.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ _.assignIn(util, {
657657
const dataClone = _.cloneDeep(data);
658658

659659
const isAdmin = util.hasPermission({ topcoderRoles: [USER_ROLE.TOPCODER_ADMIN] }, req.authUser);
660-
const currentUserEmail = req.authUser.email;
660+
const currentUserId = req.authUser.userId;
661661

662662
if (isAdmin) {
663663
// even though we didn't make any changes to the data, return a clone here for consistency
@@ -671,7 +671,7 @@ _.assignIn(util, {
671671
let email;
672672
if (!invite.userId) {
673673
// mask email if non-admin or not own invite
674-
email = isAdmin || invite.email === currentUserEmail ? invite.email : util.maskEmail(invite.email);
674+
email = isAdmin || invite.createdBy === currentUserId ? invite.email : util.maskEmail(invite.email);
675675
} else {
676676
// userId is defined, no email field returned
677677
email = null;

‎src/util.spec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ describe('Util method', () => {
146146
{
147147
id: 1,
148148
email: 'abcd@aaaa.com',
149+
createdBy: 2,
149150
},
150151
],
151152
};
@@ -154,6 +155,7 @@ describe('Util method', () => {
154155
{
155156
id: 1,
156157
email: 'abcd@aaaa.com',
158+
createdBy: 2,
157159
},
158160
],
159161
};
@@ -169,6 +171,7 @@ describe('Util method', () => {
169171
invites: [{
170172
id: 2,
171173
email: 'abcd@aaaa.com',
174+
createdBy: 2,
172175
},
173176
],
174177
};
@@ -177,6 +180,7 @@ describe('Util method', () => {
177180
invites: [{
178181
id: 2,
179182
email: 'abcd@aaaa.com',
183+
createdBy: 2,
180184
},
181185
],
182186
};

0 commit comments

Comments
 (0)