From 67c0efae1bfcf6e53c4eaa5cb9966348134973ab Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Fri, 23 Mar 2018 16:49:18 +0300 Subject: Allow to get the team icon for open teams (#8499) * Allow to get the team icon for open teams * feedback review --- api4/team.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/api4/team.go b/api4/team.go index f8a1c556c..33cd57fbb 100644 --- a/api4/team.go +++ b/api4/team.go @@ -741,15 +741,16 @@ func getTeamIcon(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !c.App.SessionHasPermissionToTeam(c.Session, c.Params.TeamId, model.PERMISSION_VIEW_TEAM) { - c.SetPermissionError(model.PERMISSION_VIEW_TEAM) - return - } - if team, err := c.App.GetTeam(c.Params.TeamId); err != nil { c.Err = err return } else { + if !c.App.SessionHasPermissionToTeam(c.Session, c.Params.TeamId, model.PERMISSION_VIEW_TEAM) && + (team.Type != model.TEAM_OPEN || team.AllowOpenInvite) { + c.SetPermissionError(model.PERMISSION_VIEW_TEAM) + return + } + etag := strconv.FormatInt(team.LastTeamIconUpdate, 10) if c.HandleEtag(etag, "Get Team Icon", w, r) { -- cgit v1.2.3-1-g7c22