From 0c93c4db67fd07664ce18b8cf1e7878d67518537 Mon Sep 17 00:00:00 2001 From: Victor Vrantchan Date: Tue, 17 Jan 2017 16:37:00 -0500 Subject: [PATCH] fallback to username if Name field is not set (#996) * fallback to username if Name field is not set * add orgname field to invite emails --- server/kolide/invites.go | 1 + server/service/service_invites.go | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/kolide/invites.go b/server/kolide/invites.go index d7d7656f8a..7aaac22277 100644 --- a/server/kolide/invites.go +++ b/server/kolide/invites.go @@ -76,6 +76,7 @@ type InviteMailer struct { *Invite KolideServerURL template.URL InvitedByUsername string + OrgName string } func (i *InviteMailer) Message() ([]byte, error) { diff --git a/server/service/service_invites.go b/server/service/service_invites.go index eda85d4378..8312ff4a8b 100644 --- a/server/service/service_invites.go +++ b/server/service/service_invites.go @@ -54,6 +54,10 @@ func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePaylo return nil, err } + invitedBy := inviter.Name + if invitedBy == "" { + invitedBy = inviter.Username + } inviteEmail := kolide.Email{ Subject: "You're Invited to Kolide", To: []string{invite.Email}, @@ -61,7 +65,8 @@ func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePaylo Mailer: &kolide.InviteMailer{ Invite: invite, KolideServerURL: template.URL(config.KolideServerURL), - InvitedByUsername: inviter.Name, + OrgName: config.OrgName, + InvitedByUsername: invitedBy, }, }