diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:50:52 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:50:52 -0500 |
| commit | d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (patch) | |
| tree | a99a74d6b858d73624c06f85e393acbe97c90586 /app/team.go | |
| parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
| parent | 3da5df3c90f5888a3490881957befabb37c308d5 (diff) | |
| download | chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.gz chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.bz2 chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.zip | |
Merge branch 'release-4.7-t4merge'
Diffstat (limited to 'app/team.go')
| -rw-r--r-- | app/team.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/team.go b/app/team.go index 21b8e5879..8e8c29e2a 100644 --- a/app/team.go +++ b/app/team.go @@ -234,6 +234,11 @@ func (a *App) AddUserToTeamByHash(userId string, hash string, data string) (*mod team = result.Data.(*model.Team) } + // verify that the team's invite id hasn't been changed since the invite was sent + if team.InviteId != props["invite_id"] { + return nil, model.NewAppError("JoinUserToTeamByHash", "api.user.create_user.signup_link_mismatched_invite_id.app_error", nil, "", http.StatusBadRequest) + } + var user *model.User if result := <-uchan; result.Err != nil { return nil, result.Err |