IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

APIv4 DELETE /teams/{team_id} (#5937)

Browse Source
This commit is contained in:
Saturnino Abril
2017-04-04 02:35:29 +09:00
committed by Corey Hulen
parent 43e795448f
commit 997eacd4b6
4 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api4/team.go
View File

@@ -26,6 +26,7 @@ func InitTeam() {
BaseRoutes.Team.Handle("", ApiSessionRequired(getTeam)).Methods("GET")
BaseRoutes.Team.Handle("", ApiSessionRequired(updateTeam)).Methods("PUT")
BaseRoutes.Team.Handle("", ApiSessionRequired(softDeleteTeam)).Methods("DELETE")
BaseRoutes.Team.Handle("/patch", ApiSessionRequired(patchTeam)).Methods("PUT")
BaseRoutes.Team.Handle("/stats", ApiSessionRequired(getTeamStats)).Methods("GET")
BaseRoutes.TeamMembers.Handle("", ApiSessionRequired(getTeamMembers)).Methods("GET")
@@ -165,6 +166,26 @@ func patchTeam(c *Context, w http.ResponseWriter, r *http.Request) {
w.Write([]byte(patchedTeam.ToJson()))
}
func softDeleteTeam(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequireTeamId()
if c.Err != nil {
return
}
if !app.SessionHasPermissionToTeam(c.Session, c.Params.TeamId, model.PERMISSION_MANAGE_TEAM) {
c.SetPermissionError(model.PERMISSION_MANAGE_TEAM)
return
}
err := app.SoftDeleteTeam(c.Params.TeamId)
if err != nil {
c.Err = err
return
}
ReturnStatusOK(w)
}
func getTeamsForUser(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequireUserId()
if c.Err != nil {

42
api4/team_test.go
View File

@@ -321,6 +321,48 @@ func TestPatchTeam(t *testing.T) {
CheckNoError(t, resp)
}
func TestSoftDeleteTeam(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer TearDown()
Client := th.Client
team := &model.Team{DisplayName: "DisplayName", Name: GenerateTestTeamName(), Email: GenerateTestEmail(), Type: model.TEAM_OPEN}
team, _ = Client.CreateTeam(team)
ok, resp := Client.SoftDeleteTeam(team.Id)
CheckNoError(t, resp)
if !ok {
t.Fatal("should have returned true")
}
rteam, err := app.GetTeam(team.Id)
if err != nil {
t.Fatal("should have returned archived team")
}
if rteam.DeleteAt == 0 {
t.Fatal("should have not set to zero")
}
ok, resp = Client.SoftDeleteTeam("junk")
CheckBadRequestStatus(t, resp)
if ok {
t.Fatal("should have returned false")
}
otherTeam := th.BasicTeam
_, resp = Client.SoftDeleteTeam(otherTeam.Id)
CheckForbiddenStatus(t, resp)
Client.Logout()
_, resp = Client.SoftDeleteTeam(otherTeam.Id)
CheckUnauthorizedStatus(t, resp)
_, resp = th.SystemAdminClient.SoftDeleteTeam(otherTeam.Id)
CheckNoError(t, resp)
}
func TestGetAllTeams(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer TearDown()