diff options
Diffstat (limited to 'api4')
-rw-r--r-- | api4/apitestlib.go | 2 | ||||
-rw-r--r-- | api4/channel.go | 8 | ||||
-rw-r--r-- | api4/channel_test.go | 2 | ||||
-rw-r--r-- | api4/context.go | 31 | ||||
-rw-r--r-- | api4/file.go | 2 | ||||
-rw-r--r-- | api4/post.go | 2 | ||||
-rw-r--r-- | api4/team.go | 12 | ||||
-rw-r--r-- | api4/user.go | 26 |
8 files changed, 40 insertions, 45 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 863237367..eaeb827fc 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -362,7 +362,7 @@ func (me *TestHelper) UpdateActiveUser(user *model.User, active bool) { func LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := app.JoinUserToTeam(team, user, utils.GetSiteURL()) + err := app.JoinUserToTeam(team, user) if err != nil { l4g.Error(err.Error()) l4g.Close() diff --git a/api4/channel.go b/api4/channel.go index c9a6ac6c5..78d4cc733 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -138,7 +138,7 @@ func updateChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } else { if oldChannelDisplayName != channel.DisplayName { - if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.Params.TeamId, oldChannelDisplayName, channel.DisplayName, c.GetSiteURL()); err != nil { + if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.Params.TeamId, oldChannelDisplayName, channel.DisplayName); err != nil { l4g.Error(err.Error()) } } @@ -459,7 +459,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - err = app.DeleteChannel(channel, c.Session.UserId, c.GetSiteURL()) + err = app.DeleteChannel(channel, c.Session.UserId) if err != nil { c.Err = err return @@ -733,7 +733,7 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - if cm, err := app.AddChannelMember(member.UserId, channel, c.Session.UserId, c.GetSiteURL()); err != nil { + if cm, err := app.AddChannelMember(member.UserId, channel, c.Session.UserId); err != nil { c.Err = err return } else { @@ -768,7 +768,7 @@ func removeChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { } } - if err = app.RemoveUserFromChannel(c.Params.UserId, c.Session.UserId, channel, c.GetSiteURL()); err != nil { + if err = app.RemoveUserFromChannel(c.Params.UserId, c.Session.UserId, channel); err != nil { c.Err = err return } diff --git a/api4/channel_test.go b/api4/channel_test.go index 0496be495..c5deda83e 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -680,7 +680,7 @@ func TestDeleteChannel(t *testing.T) { if ch, err := app.GetChannel(publicChannel1.Id); err == nil && ch.DeleteAt == 0 { t.Fatal("should have failed to get deleted channel") - } else if err := app.JoinChannel(ch, user2.Id, ""); err == nil { + } else if err := app.JoinChannel(ch, user2.Id); err == nil { t.Fatal("should have failed to join deleted channel") } diff --git a/api4/context.go b/api4/context.go index 8f663431d..36a48eb9d 100644 --- a/api4/context.go +++ b/api4/context.go @@ -19,14 +19,14 @@ import ( ) type Context struct { - Session model.Session - Params *ApiParams - Err *model.AppError - T goi18n.TranslateFunc - RequestId string - IpAddress string - Path string - siteURL string + Session model.Session + Params *ApiParams + Err *model.AppError + T goi18n.TranslateFunc + RequestId string + IpAddress string + Path string + siteURLHeader string } func ApiHandler(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { @@ -125,12 +125,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { isTokenFromQueryString = true } - if utils.GetSiteURL() == "" { - protocol := app.GetProtocol(r) - c.SetSiteURL(protocol + "://" + r.Host) - } else { - c.SetSiteURL(utils.GetSiteURL()) - } + c.SetSiteURLHeader(app.GetProtocol(r) + "://" + r.Host) w.Header().Set(model.HEADER_REQUEST_ID, c.RequestId) w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash, utils.IsLicensed)) @@ -320,12 +315,12 @@ func (c *Context) SetPermissionError(permission *model.Permission) { c.Err.StatusCode = http.StatusForbidden } -func (c *Context) SetSiteURL(url string) { - c.siteURL = strings.TrimRight(url, "/") +func (c *Context) SetSiteURLHeader(url string) { + c.siteURLHeader = strings.TrimRight(url, "/") } -func (c *Context) GetSiteURL() string { - return c.siteURL +func (c *Context) GetSiteURLHeader() string { + return c.siteURLHeader } func (c *Context) RequireUserId() *Context { diff --git a/api4/file.go b/api4/file.go index 6b649918f..e4bdbcc3c 100644 --- a/api4/file.go +++ b/api4/file.go @@ -160,7 +160,7 @@ func getFileLink(c *Context, w http.ResponseWriter, r *http.Request) { } resp := make(map[string]string) - resp["link"] = app.GeneratePublicLink(c.GetSiteURL(), info) + resp["link"] = app.GeneratePublicLink(c.GetSiteURLHeader(), info) w.Write([]byte(model.MapToJson(resp))) } diff --git a/api4/post.go b/api4/post.go index f16a1ba3d..67cd325d9 100644 --- a/api4/post.go +++ b/api4/post.go @@ -48,7 +48,7 @@ func createPost(c *Context, w http.ResponseWriter, r *http.Request) { post.CreateAt = 0 } - rp, err := app.CreatePostAsUser(post, c.GetSiteURL()) + rp, err := app.CreatePostAsUser(post) if err != nil { c.Err = err return diff --git a/api4/team.go b/api4/team.go index 8da308a1c..9bde841ab 100644 --- a/api4/team.go +++ b/api4/team.go @@ -63,7 +63,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - rteam, err := app.CreateTeamWithUser(team, c.Session.UserId, c.GetSiteURL()) + rteam, err := app.CreateTeamWithUser(team, c.Session.UserId) if err != nil { c.Err = err return @@ -349,14 +349,14 @@ func addTeamMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - member, err = app.AddTeamMember(member.TeamId, member.UserId, c.GetSiteURL()) + member, err = app.AddTeamMember(member.TeamId, member.UserId) } else if len(hash) > 0 && len(data) > 0 { - member, err = app.AddTeamMemberByHash(c.Session.UserId, hash, data, c.GetSiteURL()) + member, err = app.AddTeamMemberByHash(c.Session.UserId, hash, data) if err != nil { err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_data.app_error", nil, "", http.StatusNotFound) } } else if len(inviteId) > 0 { - member, err = app.AddTeamMemberByInviteId(inviteId, c.Session.UserId, c.GetSiteURL()) + member, err = app.AddTeamMemberByInviteId(inviteId, c.Session.UserId) if err != nil { err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_invite_id.app_error", nil, "", http.StatusNotFound) } @@ -407,7 +407,7 @@ func addTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - members, err = app.AddTeamMembers(c.Params.TeamId, userIds, c.GetSiteURL()) + members, err = app.AddTeamMembers(c.Params.TeamId, userIds) if err != nil { c.Err = err @@ -673,7 +673,7 @@ func inviteUsersToTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - err := app.InviteNewUsersToTeam(emailList, c.Params.TeamId, c.Session.UserId, utils.GetSiteURL()) + err := app.InviteNewUsersToTeam(emailList, c.Params.TeamId, c.Session.UserId) if err != nil { c.Err = err return diff --git a/api4/user.go b/api4/user.go index 593d704a5..b30d066ab 100644 --- a/api4/user.go +++ b/api4/user.go @@ -69,13 +69,13 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) { var ruser *model.User var err *model.AppError if len(hash) > 0 { - ruser, err = app.CreateUserWithHash(user, hash, r.URL.Query().Get("d"), c.GetSiteURL()) + ruser, err = app.CreateUserWithHash(user, hash, r.URL.Query().Get("d")) } else if len(inviteId) > 0 { - ruser, err = app.CreateUserWithInviteId(user, inviteId, c.GetSiteURL()) + ruser, err = app.CreateUserWithInviteId(user, inviteId) } else if c.IsSystemAdmin() { - ruser, err = app.CreateUserAsAdmin(user, c.GetSiteURL()) + ruser, err = app.CreateUserAsAdmin(user) } else { - ruser, err = app.CreateUserFromSignup(user, c.GetSiteURL()) + ruser, err = app.CreateUserFromSignup(user) } if err != nil { @@ -493,7 +493,7 @@ func updateUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if ruser, err := app.UpdateUserAsUser(user, c.GetSiteURL(), c.IsSystemAdmin()); err != nil { + if ruser, err := app.UpdateUserAsUser(user, c.IsSystemAdmin()); err != nil { c.Err = err return } else { @@ -519,7 +519,7 @@ func patchUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if ruser, err := app.PatchUser(c.Params.UserId, patch, c.GetSiteURL(), c.IsSystemAdmin()); err != nil { + if ruser, err := app.PatchUser(c.Params.UserId, patch, c.IsSystemAdmin()); err != nil { c.Err = err return } else { @@ -640,7 +640,7 @@ func updateUserMfa(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt") - if err := app.UpdateMfa(activate, c.Params.UserId, code, c.GetSiteURL()); err != nil { + if err := app.UpdateMfa(activate, c.Params.UserId, code); err != nil { c.Err = err return } @@ -692,9 +692,9 @@ func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) { return } - err = app.UpdatePasswordAsUser(c.Params.UserId, currentPassword, newPassword, c.GetSiteURL()) + err = app.UpdatePasswordAsUser(c.Params.UserId, currentPassword, newPassword) } else if app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { - err = app.UpdatePasswordByUserIdSendEmail(c.Params.UserId, newPassword, c.T("api.user.reset_password.method"), c.GetSiteURL()) + err = app.UpdatePasswordByUserIdSendEmail(c.Params.UserId, newPassword, c.T("api.user.reset_password.method")) } else { err = model.NewAppError("updatePassword", "api.user.update_password.context.app_error", nil, "", http.StatusForbidden) } @@ -722,7 +722,7 @@ func resetPassword(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt - code=" + code) - if err := app.ResetPasswordFromCode(code, newPassword, c.GetSiteURL()); err != nil { + if err := app.ResetPasswordFromCode(code, newPassword); err != nil { c.LogAudit("fail - code=" + code) c.Err = err return @@ -742,7 +742,7 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) { return } - if sent, err := app.SendPasswordReset(email, c.GetSiteURL()); err != nil { + if sent, err := app.SendPasswordReset(email, utils.GetSiteURL()); err != nil { c.Err = err return } else if sent { @@ -974,9 +974,9 @@ func sendVerificationEmail(c *Context, w http.ResponseWriter, r *http.Request) { } if _, err := app.GetStatus(user.Id); err != nil { - go app.SendVerifyEmail(user.Id, user.Email, user.Locale, c.GetSiteURL()) + go app.SendVerifyEmail(user.Id, user.Email, user.Locale, utils.GetSiteURL()) } else { - go app.SendEmailChangeVerifyEmail(user.Id, user.Email, user.Locale, c.GetSiteURL()) + go app.SendEmailChangeVerifyEmail(user.Id, user.Email, user.Locale, utils.GetSiteURL()) } ReturnStatusOK(w) |