summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/apitestlib.go2
-rw-r--r--api/channel.go16
-rw-r--r--api/oauth.go4
-rw-r--r--api/post.go4
-rw-r--r--api/team.go8
-rw-r--r--api/user.go6
-rw-r--r--api/webhook.go2
7 files changed, 21 insertions, 21 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go
index 4206d033e..89a65518a 100644
--- a/api/apitestlib.go
+++ b/api/apitestlib.go
@@ -158,7 +158,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 0db3499e0..d408e9478 100644
--- a/api/channel.go
+++ b/api/channel.go
@@ -207,7 +207,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())
}
}
@@ -255,7 +255,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)
@@ -301,7 +301,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)
@@ -412,7 +412,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
}
@@ -425,7 +425,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
@@ -467,7 +467,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
@@ -663,7 +663,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()))
@@ -698,7 +698,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/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 d6de65e40..4944ad28f 100644
--- a/api/post.go
+++ b/api/post.go
@@ -60,7 +60,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
@@ -339,7 +339,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 0c268b338..24a9025e4 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-13 10:06:29 +0000