From a5757b447ce19d480d7c0af71741d7d8fae6af82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Thu, 5 Dec 2019 19:28:33 +0530 Subject: [PATCH] Merge pull request #2434 from overleaf/ta-team-invite-email-fix Fix Spam Safe Inviter Name for Group Invites GitOrigin-RevId: e5e01afd53d22cd53016352c32ad1de28137ea17 --- services/web/app/src/Features/Email/EmailBuilder.js | 4 ++-- .../web/app/src/Features/Subscription/TeamInvitesHandler.js | 2 +- .../web/test/unit/src/Subscription/TeamInvitesHandlerTests.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/web/app/src/Features/Email/EmailBuilder.js b/services/web/app/src/Features/Email/EmailBuilder.js index dcd375668b..46e6d5d95d 100644 --- a/services/web/app/src/Features/Email/EmailBuilder.js +++ b/services/web/app/src/Features/Email/EmailBuilder.js @@ -307,12 +307,12 @@ templates.projectInvite = CTAEmailTemplate({ templates.verifyEmailToJoinTeam = CTAEmailTemplate({ subject(opts) { return `${_.escape( - SpamSafe.safeUserName(opts.inviterName, 'A collaborator') + _formatUserNameAndEmail(opts.inviter, 'A collaborator') )} has invited you to join a team on ${settings.appName}` }, title(opts) { return `${_.escape( - SpamSafe.safeUserName(opts.inviterName, 'A collaborator') + _formatUserNameAndEmail(opts.inviter, 'A collaborator') )} has invited you to join a team on ${settings.appName}` }, message(opts) { diff --git a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js index 9478f8ea9e..fa55f5cc7a 100644 --- a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js +++ b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js @@ -189,7 +189,7 @@ var createInvite = function(subscription, email, inviter, callback) { const opts = { to: email, - inviterName, + inviter, acceptInviteUrl: `${settings.siteUrl}/subscription/invites/${ invite.token }/`, diff --git a/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js b/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js index 626a75dd10..382b64a1d8 100644 --- a/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js +++ b/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js @@ -159,7 +159,7 @@ describe('TeamInvitesHandler', function() { 'verifyEmailToJoinTeam', sinon.match({ to: 'john.snow@example.com', - inviterName: 'Daenerys Targaryen (daenerys@example.com)', + inviter: this.manager, acceptInviteUrl: `http://example.com/subscription/invites/${ this.newToken }/`