Merge pull request #283 from mattermost/mm-1787

MM-1787 Fixing links for signup from team invite link.

1 files changed, 13 insertions, 12 deletions

diff --git a/web/web.go b/web/web.go
index 68e2a5226..8b329c149 100644
--- a/web/web.go
+++ b/web/web.go
@@ -352,27 +352,26 @@ func getChannel(c *api.Context, w http.ResponseWriter, r *http.Request) {
 
 func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
 	resend := r.URL.Query().Get("resend")
-	name := r.URL.Query().Get("name")
+	name := r.URL.Query().Get("teamname")
 	email := r.URL.Query().Get("email")
 	hashedId := r.URL.Query().Get("hid")
 	userId := r.URL.Query().Get("uid")
 
-	if resend == "true" {
-
-		teamId := ""
-		if result := <-api.Srv.Store.Team().GetByName(name); result.Err != nil {
-			c.Err = result.Err
-			return
-		} else {
-			teamId = result.Data.(*model.Team).Id
-		}
+	var team *model.Team
+	if result := <-api.Srv.Store.Team().GetByName(name); result.Err != nil {
+		c.Err = result.Err
+		return
+	} else {
+		team = result.Data.(*model.Team)
+	}
 
-		if result := <-api.Srv.Store.User().GetByEmail(teamId, email); result.Err != nil {
+	if resend == "true" {
+		if result := <-api.Srv.Store.User().GetByEmail(team.Id, email); result.Err != nil {
 			c.Err = result.Err
 			return
 		} else {
 			user := result.Data.(*model.User)
-			api.FireAndForgetVerifyEmail(user.Id, strings.Split(user.Nickname, " ")[0], user.Email, name, c.GetTeamURL())
+			api.FireAndForgetVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team))
 			http.Redirect(w, r, "/", http.StatusFound)
 			return
 		}
@@ -396,6 +395,8 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
 
 	page := NewHtmlTemplatePage("verify", "Email Verified")
 	page.Props["IsVerified"] = isVerified
+	page.Props["TeamURL"] = c.GetTeamURLFromTeam(team)
+	page.Props["UserEmail"] = email
 	page.Render(c, w)
 }