diff options
Diffstat (limited to 'api/team.go')
-rw-r--r-- | api/team.go | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/api/team.go b/api/team.go index 4010a0ac5..ec9a41993 100644 --- a/api/team.go +++ b/api/team.go @@ -57,7 +57,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { } if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_CREATE_TEAM) { - c.Err = model.NewLocAppError("createTeam", "api.team.is_team_creation_allowed.disabled.app_error", nil, "") + c.Err = model.NewAppError("createTeam", "api.team.is_team_creation_allowed.disabled.app_error", nil, "", http.StatusForbidden) return } @@ -126,8 +126,7 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { errorId = "api.team.invite_members.restricted_team_admin.app_error" } - c.Err = model.NewLocAppError("inviteMembers", errorId, nil, "") - c.Err.StatusCode = http.StatusForbidden + c.Err = model.NewAppError("inviteMembers", errorId, nil, "", http.StatusForbidden) return } @@ -199,7 +198,7 @@ func addUserToTeamFromInvite(c *Context, w http.ResponseWriter, r *http.Request) } else if len(inviteId) > 0 { team, err = app.AddUserToTeamByInviteId(inviteId, c.Session.UserId) } else { - c.Err = model.NewLocAppError("addUserToTeamFromInvite", "api.user.create_user.signup_link_invalid.app_error", nil, "") + c.Err = model.NewAppError("addUserToTeamFromInvite", "api.user.create_user.signup_link_invalid.app_error", nil, "", http.StatusBadRequest) return } @@ -372,7 +371,7 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { } if err := r.ParseMultipartForm(10000000); err != nil { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.parse.app_error", nil, err.Error()) + c.Err = model.NewAppError("importTeam", "api.team.import_team.parse.app_error", nil, err.Error(), http.StatusBadRequest) return } @@ -381,28 +380,24 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { fileSizeStr, ok := r.MultipartForm.Value["filesize"] if !ok { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.unavailable.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.unavailable.app_error", nil, "", http.StatusBadRequest) return } fileSize, err := strconv.ParseInt(fileSizeStr[0], 10, 64) if err != nil { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.integer.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.integer.app_error", nil, "", http.StatusBadRequest) return } fileInfoArray, ok := r.MultipartForm.File["file"] if !ok { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.no_file.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.no_file.app_error", nil, "", http.StatusBadRequest) return } if len(fileInfoArray) <= 0 { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.array.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.array.app_error", nil, "", http.StatusBadRequest) return } @@ -411,8 +406,7 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { fileData, err := fileInfo.Open() defer fileData.Close() if err != nil { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.open.app_error", nil, err.Error()) - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.open.app_error", nil, err.Error(), http.StatusBadRequest) return } @@ -444,7 +438,7 @@ func getInviteInfo(c *Context, w http.ResponseWriter, r *http.Request) { return } else { if !(team.Type == model.TEAM_OPEN) { - c.Err = model.NewLocAppError("getInviteInfo", "api.team.get_invite_info.not_open_team", nil, "id="+inviteId) + c.Err = model.NewAppError("getInviteInfo", "api.team.get_invite_info.not_open_team", nil, "id="+inviteId, http.StatusBadRequest) return } |