diff options
| -rw-r--r-- | api4/team.go | 16 | ||||
| -rw-r--r-- | api4/team_test.go | 36 | ||||
| -rw-r--r-- | app/team.go | 1 | ||||
| -rw-r--r-- | model/client4.go | 10 |
4 files changed, 63 insertions, 0 deletions
diff --git a/api4/team.go b/api4/team.go index d1db268dc..2e3b6b982 100644 --- a/api4/team.go +++ b/api4/team.go @@ -21,6 +21,7 @@ func InitTeam() { BaseRoutes.Team.Handle("", ApiSessionRequired(getTeam)).Methods("GET") BaseRoutes.Team.Handle("/stats", ApiHandler(getTeamStats)).Methods("GET") + BaseRoutes.TeamByName.Handle("", ApiSessionRequired(getTeamByName)).Methods("GET") BaseRoutes.TeamMember.Handle("", ApiSessionRequired(getTeamMember)).Methods("GET") } @@ -66,6 +67,21 @@ func getTeam(c *Context, w http.ResponseWriter, r *http.Request) { } } +func getTeamByName(c *Context, w http.ResponseWriter, r *http.Request) { + if team, err := app.GetTeamByName(c.Params.TeamName); err != nil { + c.Err = err + return + } else { + if team.Type != model.TEAM_OPEN && !app.SessionHasPermissionToTeam(c.Session, team.Id, model.PERMISSION_VIEW_TEAM) { + c.SetPermissionError(model.PERMISSION_VIEW_TEAM) + return + } + + w.Write([]byte(team.ToJson())) + return + } +} + func getTeamsForUser(c *Context, w http.ResponseWriter, r *http.Request) { c.RequireUserId() if c.Err != nil { diff --git a/api4/team_test.go b/api4/team_test.go index 5f7bc7b98..32f1bc967 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -114,6 +114,42 @@ func TestGetTeam(t *testing.T) { CheckNoError(t, resp) } +func TestGetTeamByName(t *testing.T) { + th := Setup().InitBasic().InitSystemAdmin() + defer TearDown() + Client := th.Client + team := th.BasicTeam + + rteam, resp := Client.GetTeamByName(team.Name, "") + CheckNoError(t, resp) + + if rteam.Name != team.Name { + t.Fatal("wrong team") + } + + _, resp = Client.GetTeamByName("junk", "") + CheckNotFoundStatus(t, resp) + + _, resp = Client.GetTeamByName("", "") + CheckNotFoundStatus(t, resp) + + Client.Logout() + _, resp = Client.GetTeamByName(team.Name, "") + CheckUnauthorizedStatus(t, resp) + + _, resp = th.SystemAdminClient.GetTeamByName(team.Name, "") + CheckNoError(t, resp) + + th.LoginTeamAdmin() + + team2 := &model.Team{DisplayName: "Name", Name: GenerateTestTeamName(), Email: GenerateTestEmail(), Type: model.TEAM_INVITE} + rteam2, _ := Client.CreateTeam(team2) + + th.LoginBasic() + _, resp = Client.GetTeamByName(rteam2.Name, "") + CheckForbiddenStatus(t, resp) +} + func TestGetTeamsForUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() defer TearDown() diff --git a/app/team.go b/app/team.go index c1560d45a..0c0a6a4da 100644 --- a/app/team.go +++ b/app/team.go @@ -304,6 +304,7 @@ func GetTeam(teamId string) (*model.Team, *model.AppError) { func GetTeamByName(name string) (*model.Team, *model.AppError) { if result := <-Srv.Store.Team().GetByName(name); result.Err != nil { + result.Err.StatusCode = http.StatusNotFound return nil, result.Err } else { return result.Data.(*model.Team), nil diff --git a/model/client4.go b/model/client4.go index c4acc6f57..c64b460e4 100644 --- a/model/client4.go +++ b/model/client4.go @@ -481,6 +481,16 @@ func (c *Client4) GetTeam(teamId, etag string) (*Team, *Response) { } } +// GetTeamByName returns a team based on the provided team name string. +func (c *Client4) GetTeamByName(name, etag string) (*Team, *Response) { + if r, err := c.DoApiGet(c.GetTeamByNameRoute(name), etag); err != nil { + return nil, &Response{StatusCode: r.StatusCode, Error: err} + } else { + defer closeBody(r) + return TeamFromJson(r.Body), BuildResponse(r) + } +} + // GetTeamsForUser returns a list of teams a user is on. Must be logged in as the user // or be a system administrator. func (c *Client4) GetTeamsForUser(userId, etag string) ([]*Team, *Response) { |