MM-63350 Add tests for inviting guest users to teams (#30448)
* MM-63350 Add tests for inviting guest users to teams * Fix style issue * Fix one more issue
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
2e44a6a1ed
Коммит
3b9f9b209a
@@ -695,7 +695,6 @@ func addTeamMember(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
var err *model.AppError
|
||||
var member model.TeamMember
|
||||
if jsonErr := json.NewDecoder(r.Body).Decode(&member); jsonErr != nil {
|
||||
c.Err = model.NewAppError("addTeamMember", "api.team.add_team_member.invalid_body.app_error", nil, "Error in model.TeamMemberFromJSON()", http.StatusBadRequest).Wrap(jsonErr)
|
||||
@@ -717,7 +716,7 @@ func addTeamMember(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
if member.UserId == c.AppContext.Session().UserId {
|
||||
var team *model.Team
|
||||
team, err = c.App.GetTeam(member.TeamId)
|
||||
team, err := c.App.GetTeam(member.TeamId)
|
||||
if err != nil {
|
||||
c.Err = err
|
||||
return
|
||||
@@ -736,6 +735,19 @@ func addTeamMember(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
c.SetPermissionError(model.PermissionAddUserToTeam)
|
||||
return
|
||||
}
|
||||
|
||||
canInviteGuests := c.App.SessionHasPermissionToTeam(*c.AppContext.Session(), c.Params.TeamId, model.PermissionInviteGuest)
|
||||
if !canInviteGuests {
|
||||
user, err := c.App.GetUser(member.UserId)
|
||||
if err != nil {
|
||||
c.Err = model.NewAppError("addTeamMembers", "api.team.user.missing_account", nil, "", http.StatusNotFound).Wrap(err)
|
||||
return
|
||||
}
|
||||
if user.IsGuest() {
|
||||
c.SetPermissionError(model.PermissionInviteGuest)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
team, err := c.App.GetTeam(member.TeamId)
|
||||
|
||||
Ссылка в новой задаче
Block a user