diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-08 09:56:00 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-08 09:56:00 -0400 |
| commit | 7571d21f3200738199981c21b9466e0028d4fcbb (patch) | |
| tree | 0341429b34bb249e52092e4196b451167e2e324c /web/web.go | |
| parent | 2ebcb3f69dd9db52cdea476f0e543eaed3420efd (diff) | |
| parent | c84fe62ca199485dccefc37e00ca2bef45d47c6d (diff) | |
| download | chat-7571d21f3200738199981c21b9466e0028d4fcbb.tar.gz chat-7571d21f3200738199981c21b9466e0028d4fcbb.tar.bz2 chat-7571d21f3200738199981c21b9466e0028d4fcbb.zip | |
Merge pull request #931 from rgarmsen2295/plt-112
PLT-112 Improves email change verification process
Diffstat (limited to 'web/web.go')
| -rw-r--r-- | web/web.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index b87636187..87c96659d 100644 --- a/web/web.go +++ b/web/web.go @@ -414,7 +414,12 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { return } else { user := result.Data.(*model.User) - api.FireAndForgetVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) + + if user.LastActivityAt > 0 { + api.FireAndForgetEmailChangeVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) + } else { + api.FireAndForgetVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) + } newAddress := strings.Replace(r.URL.String(), "&resend=true", "&resend_success=true", -1) http.Redirect(w, r, newAddress, http.StatusFound) |