From 82b36b3721d6ee129d27c3fc3957d4e37643d4a6 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 26 Jun 2017 13:25:43 -0400 Subject: PLT-6815 Do not disconnect websocket when joining a team (#6746) * Do not disconnect websocket when joining a team * Fix eslint error --- api4/team.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api4/team.go') diff --git a/api4/team.go b/api4/team.go index e51dcc16b..63089fdc5 100644 --- a/api4/team.go +++ b/api4/team.go @@ -374,12 +374,12 @@ func addUserToTeamFromInvite(c *Context, w http.ResponseWriter, r *http.Request) if len(hash) > 0 && len(data) > 0 { member, err = app.AddTeamMemberByHash(c.Session.UserId, hash, data) if err != nil { - err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_data.app_error", nil, "", http.StatusNotFound) + err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_data.app_error", nil, "", http.StatusBadRequest) } } else if len(inviteId) > 0 { member, err = app.AddTeamMemberByInviteId(inviteId, c.Session.UserId) if err != nil { - err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_invite_id.app_error", nil, "", http.StatusNotFound) + err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_invite_id.app_error", nil, "", http.StatusBadRequest) } } else { err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.missing_parameter.app_error", nil, "", http.StatusBadRequest) -- cgit v1.2.3-1-g7c22