From c58c08283ed1813c9f617271b91d90ca2914464a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 11 Oct 2019 16:20:55 +0200 Subject: [PATCH] Fixing guest invites acceptance (#12698) --- api4/team.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api4/team.go b/api4/team.go index 06e130ae3e..7891f68074 100644 --- a/api4/team.go +++ b/api4/team.go @@ -499,14 +499,14 @@ func addUserToTeamFromInvite(c *Context, w http.ResponseWriter, r *http.Request) var member *model.TeamMember var err *model.AppError - if c.App.Session.Props[model.SESSION_PROP_IS_GUEST] == "true" { - c.Err = model.NewAppError("addUserToTeamFromInvite", "api.team.add_user_to_team_from_invite.guest.app_error", nil, "", http.StatusForbidden) - return - } - if len(tokenId) > 0 { member, err = c.App.AddTeamMemberByToken(c.App.Session.UserId, tokenId) } else if len(inviteId) > 0 { + if c.App.Session.Props[model.SESSION_PROP_IS_GUEST] == "true" { + c.Err = model.NewAppError("addUserToTeamFromInvite", "api.team.add_user_to_team_from_invite.guest.app_error", nil, "", http.StatusForbidden) + return + } + member, err = c.App.AddTeamMemberByInviteId(inviteId, c.App.Session.UserId) } else { err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.missing_parameter.app_error", nil, "", http.StatusBadRequest)