diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:19:45 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:19:45 -0400 |
commit | 772a4337c62c07e9f825ddc68283be2bee3b280e (patch) | |
tree | 8e05a6107666674707d78502f3c221001f5ddd4d /web/web.go | |
parent | f340d21cf417547b7c35f435c7f071091e2c222c (diff) | |
parent | b4be8eb554d4de1de5b4928a37cb72c34d565487 (diff) | |
download | chat-772a4337c62c07e9f825ddc68283be2bee3b280e.tar.gz chat-772a4337c62c07e9f825ddc68283be2bee3b280e.tar.bz2 chat-772a4337c62c07e9f825ddc68283be2bee3b280e.zip |
Merge pull request #739 from rgarmsen2295/plt-39
PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
Diffstat (limited to 'web/web.go')
-rw-r--r-- | web/web.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index 95a5a5881..0cf45766e 100644 --- a/web/web.go +++ b/web/web.go @@ -359,6 +359,7 @@ 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") + resendSuccess := r.URL.Query().Get("resend_success") name := r.URL.Query().Get("teamname") email := r.URL.Query().Get("email") hashedId := r.URL.Query().Get("hid") @@ -379,7 +380,9 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { } else { user := result.Data.(*model.User) api.FireAndForgetVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) - http.Redirect(w, r, "/", http.StatusFound) + + newAddress := strings.Replace(r.URL.String(), "&resend=true", "&resend_success=true", -1) + http.Redirect(w, r, newAddress, http.StatusFound) return } } @@ -404,6 +407,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { page.Props["IsVerified"] = isVerified page.Props["TeamURL"] = c.GetTeamURLFromTeam(team) page.Props["UserEmail"] = email + page.Props["ResendSuccess"] = resendSuccess page.Render(c, w) } |