From a8e68bd8905972ae59de90fa33d5b3e3c274dc47 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 10 Mar 2017 05:18:18 -0500 Subject: PLT-5765 Passed SiteURL to SendNotifications (#5705) --- api/apitestlib.go | 2 +- api/channel.go | 16 ++++++++-------- api/command.go | 2 +- api/command_echo.go | 2 +- api/command_join.go | 2 +- api/command_loadtest.go | 4 ++-- api/command_msg.go | 2 +- api/oauth.go | 4 ++-- api/post.go | 4 ++-- api/team.go | 8 ++++---- api/user.go | 6 +++--- api/webhook.go | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) (limited to 'api') diff --git a/api/apitestlib.go b/api/apitestlib.go index 475469a36..ea0d12d4a 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -152,7 +152,7 @@ func (me *TestHelper) CreateUser(client *model.Client) *model.User { func LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := app.JoinUserToTeam(team, user) + err := app.JoinUserToTeam(team, user, utils.GetSiteURL()) if err != nil { l4g.Error(err.Error()) l4g.Close() diff --git a/api/channel.go b/api/channel.go index 9c11f073e..062f582a7 100644 --- a/api/channel.go +++ b/api/channel.go @@ -206,7 +206,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.TeamId, oldChannelDisplayName, channel.DisplayName); err != nil { + if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelDisplayName, channel.DisplayName, c.GetSiteURL()); err != nil { l4g.Error(err.Error()) } } @@ -254,7 +254,7 @@ func updateChannelHeader(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } else { - if err := app.PostUpdateChannelHeaderMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelHeader, channelHeader); err != nil { + if err := app.PostUpdateChannelHeaderMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelHeader, channelHeader, c.GetSiteURL()); err != nil { l4g.Error(err.Error()) } c.LogAudit("name=" + channel.Name) @@ -300,7 +300,7 @@ func updateChannelPurpose(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } else { - if err := app.PostUpdateChannelPurposeMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelPurpose, channelPurpose); err != nil { + if err := app.PostUpdateChannelPurposeMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelPurpose, channelPurpose, c.GetSiteURL()); err != nil { l4g.Error(err.Error()) } c.LogAudit("name=" + channel.Name) @@ -411,7 +411,7 @@ func join(c *Context, w http.ResponseWriter, r *http.Request) { } } - if err = app.JoinChannel(channel, c.Session.UserId); err != nil { + if err = app.JoinChannel(channel, c.Session.UserId, c.GetSiteURL()); err != nil { c.Err = err return } @@ -424,7 +424,7 @@ func leave(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) id := params["channel_id"] - err := app.LeaveChannel(id, c.Session.UserId) + err := app.LeaveChannel(id, c.Session.UserId, c.GetSiteURL()) if err != nil { c.Err = err return @@ -466,7 +466,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { } } - err = app.DeleteChannel(channel, c.Session.UserId) + err = app.DeleteChannel(channel, c.Session.UserId, c.GetSiteURL()) if err != nil { c.Err = err return @@ -647,7 +647,7 @@ func addMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - go app.PostAddToChannelMessage(oUser, nUser, channel) + go app.PostAddToChannelMessage(oUser, nUser, channel, c.GetSiteURL()) app.UpdateChannelLastViewedAt([]string{id}, oUser.Id) w.Write([]byte(cm.ToJson())) @@ -682,7 +682,7 @@ func removeMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err = app.RemoveUserFromChannel(userIdToRemove, c.Session.UserId, channel); err != nil { + if err = app.RemoveUserFromChannel(userIdToRemove, c.Session.UserId, channel, c.GetSiteURL()); err != nil { c.Err = err return } diff --git a/api/command.go b/api/command.go index c3a64702f..9acc3485c 100644 --- a/api/command.go +++ b/api/command.go @@ -251,7 +251,7 @@ func handleResponse(c *Context, w http.ResponseWriter, response *model.CommandRe } } - if _, err := app.CreateCommandPost(post, c.TeamId, response); err != nil { + if _, err := app.CreateCommandPost(post, c.TeamId, response, c.GetSiteURL()); err != nil { l4g.Error(err.Error()) } diff --git a/api/command_echo.go b/api/command_echo.go index 2e931e414..38e8e07b5 100644 --- a/api/command_echo.go +++ b/api/command_echo.go @@ -88,7 +88,7 @@ func (me *EchoProvider) DoCommand(c *Context, args *model.CommandArgs, message s time.Sleep(time.Duration(delay) * time.Second) - if _, err := app.CreatePost(post, c.TeamId, true); err != nil { + if _, err := app.CreatePost(post, c.TeamId, true, c.GetSiteURL()); err != nil { l4g.Error(c.T("api.command_echo.create.app_error"), err) } }() diff --git a/api/command_join.go b/api/command_join.go index 17deb02b7..25c62d8c9 100644 --- a/api/command_join.go +++ b/api/command_join.go @@ -45,7 +45,7 @@ func (me *JoinProvider) DoCommand(c *Context, args *model.CommandArgs, message s return &model.CommandResponse{Text: c.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - if err := app.JoinChannel(channel, c.Session.UserId); err != nil { + if err := app.JoinChannel(channel, c.Session.UserId, c.GetSiteURL()); err != nil { return &model.CommandResponse{Text: c.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } diff --git a/api/command_loadtest.go b/api/command_loadtest.go index dfbbadc3b..cc5c19ab7 100644 --- a/api/command_loadtest.go +++ b/api/command_loadtest.go @@ -359,7 +359,7 @@ func (me *LoadTestProvider) UrlCommand(c *Context, channelId string, message str post.ChannelId = channelId post.UserId = c.Session.UserId - if _, err := app.CreatePost(post, c.TeamId, false); err != nil { + if _, err := app.CreatePost(post, c.TeamId, false, c.GetSiteURL()); err != nil { return &model.CommandResponse{Text: "Unable to create post", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } } @@ -398,7 +398,7 @@ func (me *LoadTestProvider) JsonCommand(c *Context, channelId string, message st post.Message = message } - if _, err := app.CreatePost(post, c.TeamId, false); err != nil { + if _, err := app.CreatePost(post, c.TeamId, false, c.GetSiteURL()); err != nil { return &model.CommandResponse{Text: "Unable to create post", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } return &model.CommandResponse{Text: "Loaded data", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} diff --git a/api/command_msg.go b/api/command_msg.go index f8c8fae1c..6ed101004 100644 --- a/api/command_msg.go +++ b/api/command_msg.go @@ -86,7 +86,7 @@ func (me *msgProvider) DoCommand(c *Context, args *model.CommandArgs, message st post.Message = parsedMessage post.ChannelId = targetChannelId post.UserId = c.Session.UserId - if _, err := app.CreatePost(post, c.TeamId, true); err != nil { + if _, err := app.CreatePost(post, c.TeamId, true, c.GetSiteURL()); err != nil { return &model.CommandResponse{Text: c.T("api.command_msg.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } } diff --git a/api/oauth.go b/api/oauth.go index 659d5c129..25d4a89f9 100644 --- a/api/oauth.go +++ b/api/oauth.go @@ -285,7 +285,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { action := props["action"] switch action { case model.OAUTH_ACTION_SIGNUP: - if user, err := app.CreateOAuthUser(service, body, teamId); err != nil { + if user, err := app.CreateOAuthUser(service, body, teamId, c.GetSiteURL()); err != nil { c.Err = err } else { doLogin(c, w, r, user, "") @@ -297,7 +297,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { case model.OAUTH_ACTION_LOGIN: user := LoginByOAuth(c, w, r, service, body) if len(teamId) > 0 { - c.Err = app.AddUserToTeamByTeamId(teamId, user) + c.Err = app.AddUserToTeamByTeamId(teamId, user, c.GetSiteURL()) } if c.Err == nil { if val, ok := props["redirect_to"]; ok { diff --git a/api/post.go b/api/post.go index 4e7801e2b..f5b551218 100644 --- a/api/post.go +++ b/api/post.go @@ -58,7 +58,7 @@ func createPost(c *Context, w http.ResponseWriter, r *http.Request) { post.CreateAt = 0 } - rp, err := app.CreatePostAsUser(post) + rp, err := app.CreatePostAsUser(post, c.GetSiteURL()) if err != nil { c.Err = err return @@ -284,7 +284,7 @@ func getPermalinkTmp(c *Context, w http.ResponseWriter, r *http.Request) { } } - if list, err := app.GetPermalinkPost(postId, c.Session.UserId); err != nil { + if list, err := app.GetPermalinkPost(postId, c.Session.UserId, c.GetSiteURL()); err != nil { c.Err = err return } else if HandleEtag(list.Etag(), "Get Permalink TMP", w, r) { diff --git a/api/team.go b/api/team.go index 3d6f18714..dda3b9d9d 100644 --- a/api/team.go +++ b/api/team.go @@ -61,7 +61,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - rteam, err := app.CreateTeamWithUser(team, c.Session.UserId) + rteam, err := app.CreateTeamWithUser(team, c.Session.UserId, c.GetSiteURL()) if err != nil { c.Err = err return @@ -153,7 +153,7 @@ func addUserToTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - if _, err := app.AddUserToTeam(c.TeamId, userId); err != nil { + if _, err := app.AddUserToTeam(c.TeamId, userId, c.GetSiteURL()); err != nil { c.Err = err return } @@ -195,9 +195,9 @@ func addUserToTeamFromInvite(c *Context, w http.ResponseWriter, r *http.Request) var err *model.AppError if len(hash) > 0 { - team, err = app.AddUserToTeamByHash(c.Session.UserId, hash, data) + team, err = app.AddUserToTeamByHash(c.Session.UserId, hash, data, c.GetSiteURL()) } else if len(inviteId) > 0 { - team, err = app.AddUserToTeamByInviteId(inviteId, c.Session.UserId) + team, err = app.AddUserToTeamByInviteId(inviteId, c.Session.UserId, c.GetSiteURL()) } else { c.Err = model.NewLocAppError("addUserToTeamFromInvite", "api.user.create_user.signup_link_invalid.app_error", nil, "") return diff --git a/api/user.go b/api/user.go index 183f4e100..cac6aeade 100644 --- a/api/user.go +++ b/api/user.go @@ -89,7 +89,7 @@ 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")) + ruser, err = app.CreateUserWithHash(user, hash, r.URL.Query().Get("d"), c.GetSiteURL()) } else if len(inviteId) > 0 { ruser, err = app.CreateUserWithInviteId(user, inviteId, c.GetSiteURL()) } else { @@ -158,7 +158,7 @@ func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service st var err *model.AppError if user, err = app.GetUserByAuth(&authData, service); err != nil { if err.Id == store.MISSING_AUTH_ACCOUNT_ERROR { - if user, err = app.CreateOAuthUser(service, bytes.NewReader(buf.Bytes()), ""); err != nil { + if user, err = app.CreateOAuthUser(service, bytes.NewReader(buf.Bytes()), "", c.GetSiteURL()); err != nil { c.Err = err return nil } @@ -1411,7 +1411,7 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { relayProps = model.MapFromJson(strings.NewReader(stateStr)) } - if user, err := samlInterface.DoLogin(encodedXML, relayProps); err != nil { + if user, err := samlInterface.DoLogin(encodedXML, relayProps, c.GetSiteURL()); err != nil { c.Err = err c.Err.StatusCode = http.StatusFound return diff --git a/api/webhook.go b/api/webhook.go index 12751943e..a86af98c0 100644 --- a/api/webhook.go +++ b/api/webhook.go @@ -374,7 +374,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { parsedRequest := model.IncomingWebhookRequestFromJson(payload) - err := app.HandleIncomingWebhook(id, parsedRequest) + err := app.HandleIncomingWebhook(id, parsedRequest, c.GetSiteURL()) if err != nil { c.Err = err return -- cgit v1.2.3-1-g7c22