diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-26 13:25:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 13:25:43 -0400 |
| commit | 82b36b3721d6ee129d27c3fc3957d4e37643d4a6 (patch) | |
| tree | e43d5cdb6e008149196781b4cd9146ce14447ac5 /api4 | |
| parent | 072da672a8bd62d730977a73966274b47ea9e0de (diff) | |
| download | chat-82b36b3721d6ee129d27c3fc3957d4e37643d4a6.tar.gz chat-82b36b3721d6ee129d27c3fc3957d4e37643d4a6.tar.bz2 chat-82b36b3721d6ee129d27c3fc3957d4e37643d4a6.zip | |
PLT-6815 Do not disconnect websocket when joining a team (#6746)
* Do not disconnect websocket when joining a team
* Fix eslint error
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/team.go | 4 | ||||
| -rw-r--r-- | api4/team_test.go | 12 |
2 files changed, 8 insertions, 8 deletions
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) diff --git a/api4/team_test.go b/api4/team_test.go index f21a93449..c5e08fe97 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -927,14 +927,14 @@ func TestAddTeamMember(t *testing.T) { } tm, resp = Client.AddTeamMemberFromInvite("junk", data, "") - CheckNotFoundStatus(t, resp) + CheckBadRequestStatus(t, resp) if tm != nil { t.Fatal("should have not returned team member") } _, resp = Client.AddTeamMemberFromInvite(hashed, "junk", "") - CheckNotFoundStatus(t, resp) + CheckBadRequestStatus(t, resp) // expired data of more than 50 hours dataObject["time"] = fmt.Sprintf("%v", model.GetMillis()-1000*60*60*50) @@ -942,7 +942,7 @@ func TestAddTeamMember(t *testing.T) { hashed = utils.HashSha256(fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) tm, resp = Client.AddTeamMemberFromInvite(hashed, data, "") - CheckNotFoundStatus(t, resp) + CheckBadRequestStatus(t, resp) // invalid team id dataObject["id"] = GenerateTestId() @@ -950,7 +950,7 @@ func TestAddTeamMember(t *testing.T) { hashed = utils.HashSha256(fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) tm, resp = Client.AddTeamMemberFromInvite(hashed, data, "") - CheckNotFoundStatus(t, resp) + CheckBadRequestStatus(t, resp) // by invite_id Client.Login(otherUser.Email, otherUser.Password) @@ -971,14 +971,14 @@ func TestAddTeamMember(t *testing.T) { } tm, resp = Client.AddTeamMemberFromInvite("", "", "junk") - CheckNotFoundStatus(t, resp) + CheckBadRequestStatus(t, resp) if tm != nil { t.Fatal("should have not returned team member") } _, resp = Client.AddTeamMemberFromInvite("", "", "junk") - CheckNotFoundStatus(t, resp) + CheckBadRequestStatus(t, resp) } func TestAddTeamMembers(t *testing.T) { |