Add profile name to new team owner welcome mail (#4378)

wireapp · Dec 17, 2024 · 5a260a0 · 5a260a0
1 parent fc9e266
commit 5a260a0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/changelog.d/3-bug-fixes/WPB-15085 b/changelog.d/3-bug-fixes/WPB-15085
@@ -0,0 +1 @@
+Add profile name to new team owner welcome mail
diff --git a/libs/wire-subsystems/src/Wire/EmailSubsystem/Template.hs b/libs/wire-subsystems/src/Wire/EmailSubsystem/Template.hs
@@ -210,15 +210,6 @@ data MemberWelcomeEmailTemplate = MemberWelcomeEmailTemplate
     memberWelcomeEmailSenderName :: !Text
   }
 
-data PersonalUserMemberWelcomeEmailTemplate = PersonalUserMemberWelcomeEmailTemplate
-  { personalUserMemberWelcomeEmailUrl :: !Text,
-    personalUserMemberWelcomeEmailSubject :: !Template,
-    personalUserMemberWelcomeEmailBodyText :: !Template,
-    personalUserMemberWelcomeEmailBodyHtml :: !Template,
-    personalUserMemberWelcomeEmailSender :: !EmailAddress,
-    personalUserMemberWelcomeEmailSenderName :: !Text
-  }
-
 data NewTeamOwnerWelcomeEmailTemplate = NewTeamOwnerWelcomeEmailTemplate
   { newTeamOwnerWelcomeEmailUrl :: !Text,
     newTeamOwnerWelcomeEmailSubject :: !Template,
@@ -233,6 +224,5 @@ data TeamTemplates = TeamTemplates
     existingUserInvitationEmail :: !InvitationEmailTemplate,
     creatorWelcomeEmail :: !CreatorWelcomeEmailTemplate,
     memberWelcomeEmail :: !MemberWelcomeEmailTemplate,
-    personalUserMemberWelcomeEmail :: !PersonalUserMemberWelcomeEmailTemplate,
     newTeamOwnerWelcomeEmail :: !NewTeamOwnerWelcomeEmailTemplate
   }
diff --git a/services/brig/src/Brig/API/User.hs b/services/brig/src/Brig/API/User.hs
@@ -302,6 +302,7 @@ upgradePersonalToTeam luid bNewTeam = do
         tid
         bNewTeam.bnuTeam.newTeamName.fromRange
         (Just user.userLocale)
+        user.userDisplayName
 
     pure $! createUserTeam
 

diff --git a/services/brig/src/Brig/Team/Email.hs b/services/brig/src/Brig/Team/Email.hs
@@ -40,11 +40,11 @@ sendMemberWelcomeMail to tid teamName loc = do
   branding <- asks (.templateBranding)
   liftSem $ sendMail $ renderMemberWelcomeMail to tid teamName tpl branding
 
-sendNewTeamOwnerWelcomeEmail :: (Member EmailSending r) => EmailAddress -> TeamId -> Text -> Maybe Locale -> (AppT r) ()
-sendNewTeamOwnerWelcomeEmail to tid teamName loc = do
+sendNewTeamOwnerWelcomeEmail :: (Member EmailSending r) => EmailAddress -> TeamId -> Text -> Maybe Locale -> Name -> (AppT r) ()
+sendNewTeamOwnerWelcomeEmail to tid teamName loc profileName = do
   tpl <- newTeamOwnerWelcomeEmail . snd <$> teamTemplatesWithLocale loc
   branding <- asks (.templateBranding)
-  liftSem $ sendMail $ renderNewTeamOwnerWelcomeEmail to tid teamName tpl branding
+  liftSem $ sendMail $ renderNewTeamOwnerWelcomeEmail to tid teamName profileName tpl branding
 
 -------------------------------------------------------------------------------
 -- Member Welcome Email
@@ -74,8 +74,8 @@ renderMemberWelcomeMail emailTo tid teamName MemberWelcomeEmailTemplate {..} bra
 -------------------------------------------------------------------------------
 -- New Team Owner Welcome Email
 
-renderNewTeamOwnerWelcomeEmail :: EmailAddress -> TeamId -> Text -> NewTeamOwnerWelcomeEmailTemplate -> TemplateBranding -> Mail
-renderNewTeamOwnerWelcomeEmail emailTo tid teamName NewTeamOwnerWelcomeEmailTemplate {..} branding =
+renderNewTeamOwnerWelcomeEmail :: EmailAddress -> TeamId -> Text -> Name -> NewTeamOwnerWelcomeEmailTemplate -> TemplateBranding -> Mail
+renderNewTeamOwnerWelcomeEmail emailTo tid teamName profileName NewTeamOwnerWelcomeEmailTemplate {..} branding =
   (emptyMail from)
     { mailTo = [to],
       mailHeaders =
@@ -94,4 +94,5 @@ renderNewTeamOwnerWelcomeEmail emailTo tid teamName NewTeamOwnerWelcomeEmailTemp
     replace "email" = fromEmail emailTo
     replace "team_id" = idToText tid
     replace "team_name" = teamName
+    replace "name" = profileName.fromName
     replace x = x
diff --git a/services/brig/src/Brig/Team/Template.hs b/services/brig/src/Brig/Team/Template.hs
@@ -63,14 +63,6 @@ loadTeamTemplates o = readLocalesDir defLocale (templateDir gOptions) "team" $ \
             <*> pure (emailSender gOptions)
             <*> readText fp "email/sender.txt"
         )
-    <*> ( PersonalUserMemberWelcomeEmailTemplate
-            ""
-            (template "")
-            (template "")
-            (template "")
-            (emailSender gOptions)
-            <$> readText fp "email/sender.txt"
-        )
     <*> ( NewTeamOwnerWelcomeEmailTemplate (tCreatorWelcomeUrl tOptions)
             <$> readTemplate fp "email/new-team-owner-welcome-subject.txt"
             <*> readTemplate fp "email/new-team-owner-welcome.txt"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add profile name to new team owner welcome mail