From 0703c6d21d59baa75da8e400799155f0bee89fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= <timothee.alby@gmail.com>
Date: Wed, 23 Mar 2022 10:20:22 +0100
Subject: [PATCH] Merge pull request #7142 from
 overleaf/ii-6756-gmail-flags-emails-as-dangerous

Change security email title

GitOrigin-RevId: d33c9d7998ada059dac61ba0d13eefedd66237fc
---
 .../app/src/Features/Email/EmailOptionsHelper.js  | 15 ++++++++++++---
 .../Features/User/ThirdPartyIdentityManager.js    |  2 +-
 .../src/User/ThirdPartyIdentityManagerTests.js    |  4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/services/web/app/src/Features/Email/EmailOptionsHelper.js b/services/web/app/src/Features/Email/EmailOptionsHelper.js
index 2d064008b2..e8245f796e 100644
--- a/services/web/app/src/Features/Email/EmailOptionsHelper.js
+++ b/services/web/app/src/Features/Email/EmailOptionsHelper.js
@@ -1,16 +1,25 @@
 function _getIndefiniteArticle(providerName) {
   const vowels = ['a', 'e', 'i', 'o', 'u']
-  if (vowels.includes(providerName.charAt(0).toLowerCase())) return 'an'
-  return 'a'
+
+  return vowels.includes(providerName.charAt(0).toLowerCase()) ? 'an' : 'a'
+}
+
+function _actionBuilder(providerName, action, accountLinked) {
+  if (providerName.toLowerCase() !== 'google') {
+    return `${providerName} account ${action}`
+  }
+
+  return accountLinked ? `New account ${action}` : `Account ${action}`
 }
 
 function linkOrUnlink(accountLinked, providerName, email) {
   const action = accountLinked ? 'linked' : 'no longer linked'
   const actionDescribed = accountLinked ? 'was linked to' : 'was unlinked from'
   const indefiniteArticle = _getIndefiniteArticle(providerName)
+
   return {
     to: email,
-    action: `${providerName} account ${action}`,
+    action: _actionBuilder(providerName, action, accountLinked),
     actionDescribed: `${indefiniteArticle} ${providerName} account ${actionDescribed} your account ${email}`,
   }
 }
diff --git a/services/web/app/src/Features/User/ThirdPartyIdentityManager.js b/services/web/app/src/Features/User/ThirdPartyIdentityManager.js
index 4d318b5668..1a564db4c2 100644
--- a/services/web/app/src/Features/User/ThirdPartyIdentityManager.js
+++ b/services/web/app/src/Features/User/ThirdPartyIdentityManager.js
@@ -201,7 +201,7 @@ function _sendSecurityAlert(accountLinked, providerId, user, userId) {
     if (error) {
       logger.error(
         { err: error, userId },
-        `could not send security alert email when ${emailOptions.action}`
+        `could not send security alert email when ${emailOptions.action.toLowerCase()}`
       )
     }
   })
diff --git a/services/web/test/unit/src/User/ThirdPartyIdentityManagerTests.js b/services/web/test/unit/src/User/ThirdPartyIdentityManagerTests.js
index 3667a7cb93..ce591a5cb0 100644
--- a/services/web/test/unit/src/User/ThirdPartyIdentityManagerTests.js
+++ b/services/web/test/unit/src/User/ThirdPartyIdentityManagerTests.js
@@ -155,7 +155,7 @@ describe('ThirdPartyIdentityManager', function () {
                   err: anError,
                   userId: this.userId,
                 },
-                'could not send security alert email when Google account linked'
+                'could not send security alert email when new account linked'
               )
               done()
             }
@@ -226,7 +226,7 @@ describe('ThirdPartyIdentityManager', function () {
                   err: anError,
                   userId: this.userId,
                 },
-                'could not send security alert email when Google account no longer linked'
+                'could not send security alert email when account no longer linked'
               )
               done()
             }