diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-07-31 08:56:24 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-07-31 08:56:24 -0400 |
commit | b7869cdb3cd60b1c8ed420dbf4839990e5e0a797 (patch) | |
tree | dd4a3b1c789d89e47507d809b1481ca3ffb5acb4 /api | |
parent | 0ecc1dba8168483eb2a09dfcea2d64d49ed5f596 (diff) | |
parent | 9cc369b6b637139d7ae53eb2d834ff8a6eeb439c (diff) | |
download | chat-b7869cdb3cd60b1c8ed420dbf4839990e5e0a797.tar.gz chat-b7869cdb3cd60b1c8ed420dbf4839990e5e0a797.tar.bz2 chat-b7869cdb3cd60b1c8ed420dbf4839990e5e0a797.zip |
Merge pull request #283 from mattermost/mm-1787
MM-1787 Fixing links for signup from team invite link.
Diffstat (limited to 'api')
-rw-r--r-- | api/user.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/api/user.go b/api/user.go index 5d6e649cb..e2d80b366 100644 --- a/api/user.go +++ b/api/user.go @@ -195,7 +195,7 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { l4g.Error("Failed to set email verified err=%v", cresult.Err) } } else { - FireAndForgetVerifyEmail(result.Data.(*model.User).Id, ruser.FirstName, ruser.Email, team.DisplayName, c.GetTeamURLFromTeam(team)) + FireAndForgetVerifyEmail(result.Data.(*model.User).Id, ruser.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) } ruser.Sanitize(map[string]bool{}) @@ -225,19 +225,18 @@ func fireAndForgetWelcomeEmail(name, email, teamDisplayName, link string) { }() } -func FireAndForgetVerifyEmail(userId, name, email, teamDisplayName, teamURL string) { +func FireAndForgetVerifyEmail(userId, userEmail, teamName, teamDisplayName, siteURL, teamURL string) { go func() { - link := fmt.Sprintf("%s/verify_email?uid=%s&hid=%s", teamURL, userId, model.HashPassword(userId)) + link := fmt.Sprintf("%s/verify_email?uid=%s&hid=%s&teamname=%s&email=%s", siteURL, userId, model.HashPassword(userId), teamName, userEmail) subjectPage := NewServerTemplatePage("verify_subject", teamURL) subjectPage.Props["TeamDisplayName"] = teamDisplayName bodyPage := NewServerTemplatePage("verify_body", teamURL) - bodyPage.Props["Nickname"] = name bodyPage.Props["TeamDisplayName"] = teamDisplayName bodyPage.Props["VerifyUrl"] = link - if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil { + if err := utils.SendMail(userEmail, subjectPage.Render(), bodyPage.Render()); err != nil { l4g.Error("Failed to send verification email successfully err=%v", err) } }() |