From c7bdce8a6641ed8d361a43b6004a351535c78423 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 4 Apr 2017 11:54:52 -0400 Subject: PLT-5900 Removed automatic configuration of SiteURL (#5952) * Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)" This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47. * Removed automatic configuration of SiteURL * Reverted unintentional config changes * Updated help text * Added link to docs in Site URL warning * Fixed merge conflict --- app/apptestlib.go | 4 +-- app/channel.go | 54 ++++++++++++++++++------------------- app/command.go | 6 ++--- app/command_echo.go | 2 +- app/command_invite_people.go | 2 +- app/command_join.go | 2 +- app/command_loadtest.go | 4 +-- app/command_msg.go | 2 +- app/import.go | 4 +-- app/notification.go | 10 +++---- app/notification_test.go | 5 ++-- app/post.go | 18 ++++++------- app/slackimport.go | 2 +- app/team.go | 44 +++++++++++++++--------------- app/team_test.go | 11 ++++---- app/user.go | 64 ++++++++++++++++++++++---------------------- app/user_test.go | 18 ++++++------- app/webhook.go | 12 ++++----- 18 files changed, 131 insertions(+), 133 deletions(-) (limited to 'app') diff --git a/app/apptestlib.go b/app/apptestlib.go index 561c98ed2..41e234130 100644 --- a/app/apptestlib.go +++ b/app/apptestlib.go @@ -161,7 +161,7 @@ func (me *TestHelper) CreatePost(channel *model.Channel) *model.Post { utils.DisableDebugLogForTest() var err *model.AppError - if post, err = CreatePost(post, channel.TeamId, false, utils.GetSiteURL()); err != nil { + if post, err = CreatePost(post, channel.TeamId, false); err != nil { l4g.Error(err.Error()) l4g.Close() time.Sleep(time.Second) @@ -174,7 +174,7 @@ func (me *TestHelper) CreatePost(channel *model.Channel) *model.Post { func LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := JoinUserToTeam(team, user, utils.GetSiteURL()) + err := JoinUserToTeam(team, user) if err != nil { l4g.Error(err.Error()) l4g.Close() diff --git a/app/channel.go b/app/channel.go index 61b139e5b..c1e0afce9 100644 --- a/app/channel.go +++ b/app/channel.go @@ -32,7 +32,7 @@ func CreateDefaultChannels(teamId string) ([]*model.Channel, *model.AppError) { return channels, nil } -func JoinDefaultChannels(teamId string, user *model.User, channelRole string, siteURL string) *model.AppError { +func JoinDefaultChannels(teamId string, user *model.User, channelRole string) *model.AppError { var err *model.AppError = nil if result := <-Srv.Store.Channel().GetByName(teamId, "town-square", true); result.Err != nil { @@ -47,7 +47,7 @@ func JoinDefaultChannels(teamId string, user *model.User, channelRole string, si err = cmResult.Err } - if err := postJoinChannelMessage(user, townSquare, siteURL); err != nil { + if err := postJoinChannelMessage(user, townSquare); err != nil { l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } @@ -66,7 +66,7 @@ func JoinDefaultChannels(teamId string, user *model.User, channelRole string, si err = cmResult.Err } - if err := postJoinChannelMessage(user, offTopic, siteURL); err != nil { + if err := postJoinChannelMessage(user, offTopic); err != nil { l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } @@ -315,7 +315,7 @@ func UpdateChannelMemberNotifyProps(data map[string]string, channelId string, us } } -func DeleteChannel(channel *model.Channel, userId string, siteURL string) *model.AppError { +func DeleteChannel(channel *model.Channel, userId string) *model.AppError { uc := Srv.Store.User().Get(userId) ihc := Srv.Store.Webhook().GetIncomingByChannel(channel.Id) ohc := Srv.Store.Webhook().GetOutgoingByChannel(channel.Id, -1, -1) @@ -355,7 +355,7 @@ func DeleteChannel(channel *model.Channel, userId string, siteURL string) *model }, } - if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil { + if _, err := CreatePost(post, channel.TeamId, false); err != nil { l4g.Error(utils.T("api.channel.delete_channel.failed_post.error"), err) } @@ -451,7 +451,7 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM return newMember, nil } -func AddChannelMember(userId string, channel *model.Channel, userRequestorId, siteURL string) (*model.ChannelMember, *model.AppError) { +func AddChannelMember(userId string, channel *model.Channel, userRequestorId string) (*model.ChannelMember, *model.AppError) { var user *model.User var err *model.AppError @@ -469,7 +469,7 @@ func AddChannelMember(userId string, channel *model.Channel, userRequestorId, si return nil, err } - go PostAddToChannelMessage(userRequestor, user, channel, siteURL) + go PostAddToChannelMessage(userRequestor, user, channel) UpdateChannelLastViewedAt([]string{channel.Id}, userRequestor.Id) @@ -512,7 +512,7 @@ func AddDirectChannels(teamId string, user *model.User) *model.AppError { return nil } -func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId string, oldChannelHeader, newChannelHeader string, siteURL string) *model.AppError { +func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId string, oldChannelHeader, newChannelHeader string) *model.AppError { uc := Srv.Store.User().Get(userId) if uresult := <-uc; uresult.Err != nil { @@ -541,7 +541,7 @@ func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId stri }, } - if _, err := CreatePost(post, teamId, false, siteURL); err != nil { + if _, err := CreatePost(post, teamId, false); err != nil { return model.NewLocAppError("", "api.channel.post_update_channel_header_message_and_forget.post.error", nil, err.Error()) } } @@ -549,7 +549,7 @@ func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId stri return nil } -func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId string, oldChannelPurpose string, newChannelPurpose string, siteURL string) *model.AppError { +func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId string, oldChannelPurpose string, newChannelPurpose string) *model.AppError { uc := Srv.Store.User().Get(userId) if uresult := <-uc; uresult.Err != nil { @@ -577,7 +577,7 @@ func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId str "new_purpose": newChannelPurpose, }, } - if _, err := CreatePost(post, teamId, false, siteURL); err != nil { + if _, err := CreatePost(post, teamId, false); err != nil { return model.NewLocAppError("", "app.channel.post_update_channel_purpose_message.post.error", nil, err.Error()) } } @@ -585,7 +585,7 @@ func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId str return nil } -func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId string, oldChannelDisplayName, newChannelDisplayName string, siteURL string) *model.AppError { +func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId string, oldChannelDisplayName, newChannelDisplayName string) *model.AppError { uc := Srv.Store.User().Get(userId) if uresult := <-uc; uresult.Err != nil { @@ -607,7 +607,7 @@ func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId }, } - if _, err := CreatePost(post, teamId, false, siteURL); err != nil { + if _, err := CreatePost(post, teamId, false); err != nil { return model.NewLocAppError("PostUpdateChannelDisplayNameMessage", "api.channel.post_update_channel_displayname_message_and_forget.create_post.error", nil, err.Error()) } } @@ -754,7 +754,7 @@ func GetChannelUnread(channelId, userId string) (*model.ChannelUnread, *model.Ap return channelUnread, nil } -func JoinChannel(channel *model.Channel, userId string, siteURL string) *model.AppError { +func JoinChannel(channel *model.Channel, userId string) *model.AppError { if channel.DeleteAt > 0 { return model.NewLocAppError("JoinChannel", "api.channel.join_channel.already_deleted.app_error", nil, "") } @@ -775,7 +775,7 @@ func JoinChannel(channel *model.Channel, userId string, siteURL string) *model.A return err } - if err := postJoinChannelMessage(user, channel, siteURL); err != nil { + if err := postJoinChannelMessage(user, channel); err != nil { return err } } else { @@ -786,7 +786,7 @@ func JoinChannel(channel *model.Channel, userId string, siteURL string) *model.A return nil } -func postJoinChannelMessage(user *model.User, channel *model.Channel, siteURL string) *model.AppError { +func postJoinChannelMessage(user *model.User, channel *model.Channel) *model.AppError { post := &model.Post{ ChannelId: channel.Id, Message: fmt.Sprintf(utils.T("api.channel.join_channel.post_and_forget"), user.Username), @@ -797,14 +797,14 @@ func postJoinChannelMessage(user *model.User, channel *model.Channel, siteURL st }, } - if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil { + if _, err := CreatePost(post, channel.TeamId, false); err != nil { return model.NewLocAppError("postJoinChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) } return nil } -func LeaveChannel(channelId string, userId string, siteURL string) *model.AppError { +func LeaveChannel(channelId string, userId string) *model.AppError { sc := Srv.Store.Channel().Get(channelId, true) uc := Srv.Store.User().Get(userId) ccm := Srv.Store.Channel().GetMemberCount(channelId, false) @@ -836,13 +836,13 @@ func LeaveChannel(channelId string, userId string, siteURL string) *model.AppErr return err } - go postLeaveChannelMessage(user, channel, siteURL) + go postLeaveChannelMessage(user, channel) } return nil } -func postLeaveChannelMessage(user *model.User, channel *model.Channel, siteURL string) *model.AppError { +func postLeaveChannelMessage(user *model.User, channel *model.Channel) *model.AppError { post := &model.Post{ ChannelId: channel.Id, Message: fmt.Sprintf(utils.T("api.channel.leave.left"), user.Username), @@ -853,14 +853,14 @@ func postLeaveChannelMessage(user *model.User, channel *model.Channel, siteURL s }, } - if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil { + if _, err := CreatePost(post, channel.TeamId, false); err != nil { return model.NewLocAppError("postLeaveChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) } return nil } -func PostAddToChannelMessage(user *model.User, addedUser *model.User, channel *model.Channel, siteURL string) *model.AppError { +func PostAddToChannelMessage(user *model.User, addedUser *model.User, channel *model.Channel) *model.AppError { post := &model.Post{ ChannelId: channel.Id, Message: fmt.Sprintf(utils.T("api.channel.add_member.added"), addedUser.Username, user.Username), @@ -872,14 +872,14 @@ func PostAddToChannelMessage(user *model.User, addedUser *model.User, channel *m }, } - if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil { + if _, err := CreatePost(post, channel.TeamId, false); err != nil { return model.NewLocAppError("postAddToChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) } return nil } -func PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User, channel *model.Channel, siteURL string) *model.AppError { +func PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User, channel *model.Channel) *model.AppError { post := &model.Post{ ChannelId: channel.Id, Message: fmt.Sprintf(utils.T("api.channel.remove_member.removed"), removedUser.Username), @@ -890,7 +890,7 @@ func PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User, }, } - if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil { + if _, err := CreatePost(post, channel.TeamId, false); err != nil { return model.NewLocAppError("postRemoveFromChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) } @@ -929,7 +929,7 @@ func removeUserFromChannel(userIdToRemove string, removerUserId string, channel return nil } -func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel *model.Channel, siteURL string) *model.AppError { +func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel *model.Channel) *model.AppError { var err *model.AppError if err = removeUserFromChannel(userIdToRemove, removerUserId, channel); err != nil { return err @@ -940,7 +940,7 @@ func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel return err } - go PostRemoveFromChannelMessage(removerUserId, user, channel, siteURL) + go PostRemoveFromChannelMessage(removerUserId, user, channel) return nil } diff --git a/app/command.go b/app/command.go index 44e846a81..188729ad5 100644 --- a/app/command.go +++ b/app/command.go @@ -38,7 +38,7 @@ func GetCommandProvider(name string) CommandProvider { return nil } -func CreateCommandPost(post *model.Post, teamId string, response *model.CommandResponse, siteURL string) (*model.Post, *model.AppError) { +func CreateCommandPost(post *model.Post, teamId string, response *model.CommandResponse) (*model.Post, *model.AppError) { post.Message = parseSlackLinksToMarkdown(response.Text) post.CreateAt = model.GetMillis() @@ -48,7 +48,7 @@ func CreateCommandPost(post *model.Post, teamId string, response *model.CommandR switch response.ResponseType { case model.COMMAND_RESPONSE_TYPE_IN_CHANNEL: - return CreatePost(post, teamId, true, siteURL) + return CreatePost(post, teamId, true) case model.COMMAND_RESPONSE_TYPE_EPHEMERAL: if response.Text == "" { return post, nil @@ -268,7 +268,7 @@ func HandleCommandResponse(command *model.Command, args *model.CommandArgs, resp } } - if _, err := CreateCommandPost(post, args.TeamId, response, args.SiteURL); err != nil { + if _, err := CreateCommandPost(post, args.TeamId, response); err != nil { l4g.Error(err.Error()) } diff --git a/app/command_echo.go b/app/command_echo.go index 3bfe67cd7..40d70e54a 100644 --- a/app/command_echo.go +++ b/app/command_echo.go @@ -88,7 +88,7 @@ func (me *EchoProvider) DoCommand(args *model.CommandArgs, message string) *mode time.Sleep(time.Duration(delay) * time.Second) - if _, err := CreatePost(post, args.TeamId, true, args.SiteURL); err != nil { + if _, err := CreatePost(post, args.TeamId, true); err != nil { l4g.Error(args.T("api.command_echo.create.app_error"), err) } }() diff --git a/app/command_invite_people.go b/app/command_invite_people.go index 12ef03f45..0496dadca 100644 --- a/app/command_invite_people.go +++ b/app/command_invite_people.go @@ -55,7 +55,7 @@ func (me *InvitePeopleProvider) DoCommand(args *model.CommandArgs, message strin return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.no_email")} } - if err := InviteNewUsersToTeam(emailList, args.TeamId, args.UserId, args.SiteURL); err != nil { + if err := InviteNewUsersToTeam(emailList, args.TeamId, args.UserId); err != nil { l4g.Error(err.Error()) return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.fail")} } diff --git a/app/command_join.go b/app/command_join.go index e7d25aa16..5b19dd7a0 100644 --- a/app/command_join.go +++ b/app/command_join.go @@ -45,7 +45,7 @@ func (me *JoinProvider) DoCommand(args *model.CommandArgs, message string) *mode return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - if err := JoinChannel(channel, args.UserId, args.SiteURL); err != nil { + if err := JoinChannel(channel, args.UserId); err != nil { return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } diff --git a/app/command_loadtest.go b/app/command_loadtest.go index b1d89826b..d3c7474ae 100644 --- a/app/command_loadtest.go +++ b/app/command_loadtest.go @@ -357,7 +357,7 @@ func (me *LoadTestProvider) UrlCommand(args *model.CommandArgs, message string) post.ChannelId = args.ChannelId post.UserId = args.UserId - if _, err := CreatePost(post, args.TeamId, false, args.SiteURL); err != nil { + if _, err := CreatePost(post, args.TeamId, false); err != nil { return &model.CommandResponse{Text: "Unable to create post", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } } @@ -396,7 +396,7 @@ func (me *LoadTestProvider) JsonCommand(args *model.CommandArgs, message string) post.Message = message } - if _, err := CreatePost(post, args.TeamId, false, args.SiteURL); err != nil { + if _, err := CreatePost(post, args.TeamId, false); 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/app/command_msg.go b/app/command_msg.go index 06b17fdc4..fd4ace61a 100644 --- a/app/command_msg.go +++ b/app/command_msg.go @@ -89,7 +89,7 @@ func (me *msgProvider) DoCommand(args *model.CommandArgs, message string) *model post.Message = parsedMessage post.ChannelId = targetChannelId post.UserId = args.UserId - if _, err := CreatePost(post, args.TeamId, true, args.SiteURL); err != nil { + if _, err := CreatePost(post, args.TeamId, true); err != nil { return &model.CommandResponse{Text: args.T("api.command_msg.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } } diff --git a/app/import.go b/app/import.go index a5ed69843..8d1173c31 100644 --- a/app/import.go +++ b/app/import.go @@ -415,7 +415,7 @@ func ImportUser(data *UserImportData, dryRun bool) *model.AppError { return err } } else { - if _, err := UpdateUser(user, utils.GetSiteURL(), false); err != nil { + if _, err := UpdateUser(user, false); err != nil { return err } if _, err := UpdateUserRoles(user.Id, roles); err != nil { @@ -865,7 +865,7 @@ func OldImportUser(team *model.Team, user *model.User) *model.User { l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err) } - if err := JoinUserToTeam(team, user, utils.GetSiteURL()); err != nil { + if err := JoinUserToTeam(team, user); err != nil { l4g.Error(utils.T("api.import.import_user.join_team.error"), err) } diff --git a/app/notification.go b/app/notification.go index 7b61de9ac..ef1b70aad 100644 --- a/app/notification.go +++ b/app/notification.go @@ -24,7 +24,7 @@ import ( "github.com/nicksnyder/go-i18n/i18n" ) -func SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User, siteURL string) ([]string, *model.AppError) { +func SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User) ([]string, *model.AppError) { pchan := Srv.Store.User().GetAllProfilesInChannel(channel.Id, true) cmnchan := Srv.Store.Channel().GetAllChannelMembersNotifyPropsForChannel(channel.Id, true) var fchan store.StoreChannel @@ -171,7 +171,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe } if userAllowsEmails && status.Status != model.STATUS_ONLINE && profileMap[id].DeleteAt == 0 { - sendNotificationEmail(post, profileMap[id], channel, team, senderName, sender, siteURL) + sendNotificationEmail(post, profileMap[id], channel, team, senderName, sender) } } } @@ -317,7 +317,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe return mentionedUsersList, nil } -func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Channel, team *model.Team, senderName string, sender *model.User, siteURL string) *model.AppError { +func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Channel, team *model.Team, senderName string, sender *model.User) *model.AppError { if channel.IsGroupOrDirect() { if result := <-Srv.Store.Team().GetTeamsByUserId(user.Id); result.Err != nil { return result.Err @@ -367,7 +367,7 @@ func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Ch var mailTemplate string var mailParameters map[string]interface{} - teamURL := siteURL + "/" + team.Name + teamURL := utils.GetSiteURL() + "/" + team.Name tm := time.Unix(post.CreateAt/1000, 0) userLocale := utils.GetUserTranslations(user.Locale) @@ -405,7 +405,7 @@ func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Ch subject := fmt.Sprintf("[%v] %v", utils.Cfg.TeamSettings.SiteName, userLocale(mailTemplate, mailParameters)) bodyPage := utils.NewHTMLTemplate("post_body", user.Locale) - bodyPage.Props["SiteURL"] = siteURL + bodyPage.Props["SiteURL"] = utils.GetSiteURL() bodyPage.Props["PostMessage"] = GetMessageForNotification(post, userLocale) if team.Name != "select_team" { bodyPage.Props["TeamLink"] = teamURL + "/pl/" + post.Id diff --git a/app/notification_test.go b/app/notification_test.go index fd8c4bf57..3768a95c7 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" ) func TestSendNotifications(t *testing.T) { @@ -19,13 +18,13 @@ func TestSendNotifications(t *testing.T) { UserId: th.BasicUser.Id, ChannelId: th.BasicChannel.Id, Message: "@" + th.BasicUser2.Username, - }, th.BasicTeam.Id, true, utils.GetSiteURL()) + }, th.BasicTeam.Id, true) if postErr != nil { t.Fatal(postErr) } - mentions, err := SendNotifications(post1, th.BasicTeam, th.BasicChannel, th.BasicUser, utils.GetSiteURL()) + mentions, err := SendNotifications(post1, th.BasicTeam, th.BasicChannel, th.BasicUser) if err != nil { t.Fatal(err) } else if mentions == nil { diff --git a/app/post.go b/app/post.go index bf797b984..7589a19df 100644 --- a/app/post.go +++ b/app/post.go @@ -49,7 +49,7 @@ func init() { } } -func CreatePostAsUser(post *model.Post, siteURL string) (*model.Post, *model.AppError) { +func CreatePostAsUser(post *model.Post) (*model.Post, *model.AppError) { // Check that channel has not been deleted var channel *model.Channel if result := <-Srv.Store.Channel().Get(post.ChannelId, true); result.Err != nil { @@ -66,7 +66,7 @@ func CreatePostAsUser(post *model.Post, siteURL string) (*model.Post, *model.App return nil, err } - if rp, err := CreatePost(post, channel.TeamId, true, siteURL); err != nil { + if rp, err := CreatePost(post, channel.TeamId, true); err != nil { if err.Id == "api.post.create_post.root_id.app_error" || err.Id == "api.post.create_post.channel_root_id.app_error" || err.Id == "api.post.create_post.parent_id.app_error" { @@ -87,7 +87,7 @@ func CreatePostAsUser(post *model.Post, siteURL string) (*model.Post, *model.App } -func CreatePost(post *model.Post, teamId string, triggerWebhooks bool, siteURL string) (*model.Post, *model.AppError) { +func CreatePost(post *model.Post, teamId string, triggerWebhooks bool) (*model.Post, *model.AppError) { var pchan store.StoreChannel if len(post.RootId) > 0 { pchan = Srv.Store.Post().Get(post.RootId) @@ -144,14 +144,14 @@ func CreatePost(post *model.Post, teamId string, triggerWebhooks bool, siteURL s } } - if err := handlePostEvents(rpost, teamId, triggerWebhooks, siteURL); err != nil { + if err := handlePostEvents(rpost, teamId, triggerWebhooks); err != nil { return nil, err } return rpost, nil } -func handlePostEvents(post *model.Post, teamId string, triggerWebhooks bool, siteURL string) *model.AppError { +func handlePostEvents(post *model.Post, teamId string, triggerWebhooks bool) *model.AppError { var tchan store.StoreChannel if len(teamId) > 0 { tchan = Srv.Store.Team().Get(teamId) @@ -188,13 +188,13 @@ func handlePostEvents(post *model.Post, teamId string, triggerWebhooks bool, sit user = result.Data.(*model.User) } - if _, err := SendNotifications(post, team, channel, user, siteURL); err != nil { + if _, err := SendNotifications(post, team, channel, user); err != nil { return err } if triggerWebhooks { go func() { - if err := handleWebhookEvents(post, team, channel, user, siteURL); err != nil { + if err := handleWebhookEvents(post, team, channel, user); err != nil { l4g.Error(err.Error()) } }() @@ -405,7 +405,7 @@ func GetFlaggedPostsForTeam(userId, teamId string, offset int, limit int) (*mode } } -func GetPermalinkPost(postId string, userId string, siteURL string) (*model.PostList, *model.AppError) { +func GetPermalinkPost(postId string, userId string) (*model.PostList, *model.AppError) { if result := <-Srv.Store.Post().Get(postId); result.Err != nil { return nil, result.Err } else { @@ -422,7 +422,7 @@ func GetPermalinkPost(postId string, userId string, siteURL string) (*model.Post return nil, err } - if err = JoinChannel(channel, userId, siteURL); err != nil { + if err = JoinChannel(channel, userId); err != nil { return nil, err } diff --git a/app/slackimport.go b/app/slackimport.go index fcdd765bb..259d0a8d4 100644 --- a/app/slackimport.go +++ b/app/slackimport.go @@ -160,7 +160,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map if result := <-Srv.Store.User().GetByEmail(email); result.Err == nil { existingUser := result.Data.(*model.User) addedUsers[sUser.Id] = existingUser - if err := JoinUserToTeam(team, addedUsers[sUser.Id], utils.GetSiteURL()); err != nil { + if err := JoinUserToTeam(team, addedUsers[sUser.Id]); err != nil { log.WriteString(utils.T("api.slackimport.slack_add_users.merge_existing_failed", map[string]interface{}{"Email": existingUser.Email, "Username": existingUser.Username})) } else { log.WriteString(utils.T("api.slackimport.slack_add_users.merge_existing", map[string]interface{}{"Email": existingUser.Email, "Username": existingUser.Username})) diff --git a/app/team.go b/app/team.go index 8ad5dd466..b0f9ae723 100644 --- a/app/team.go +++ b/app/team.go @@ -29,7 +29,7 @@ func CreateTeam(team *model.Team) (*model.Team, *model.AppError) { } } -func CreateTeamWithUser(team *model.Team, userId string, siteURL string) (*model.Team, *model.AppError) { +func CreateTeamWithUser(team *model.Team, userId string) (*model.Team, *model.AppError) { var user *model.User var err *model.AppError if user, err = GetUser(userId); err != nil { @@ -47,7 +47,7 @@ func CreateTeamWithUser(team *model.Team, userId string, siteURL string) (*model return nil, err } - if err = JoinUserToTeam(rteam, user, siteURL); err != nil { + if err = JoinUserToTeam(rteam, user); err != nil { return nil, err } @@ -161,7 +161,7 @@ func UpdateTeamMemberRoles(teamId string, userId string, newRoles string) (*mode return member, nil } -func AddUserToTeam(teamId string, userId string, siteURL string) (*model.Team, *model.AppError) { +func AddUserToTeam(teamId string, userId string) (*model.Team, *model.AppError) { tchan := Srv.Store.Team().Get(teamId) uchan := Srv.Store.User().Get(userId) @@ -179,22 +179,22 @@ func AddUserToTeam(teamId string, userId string, siteURL string) (*model.Team, * user = result.Data.(*model.User) } - if err := JoinUserToTeam(team, user, siteURL); err != nil { + if err := JoinUserToTeam(team, user); err != nil { return nil, err } return team, nil } -func AddUserToTeamByTeamId(teamId string, user *model.User, siteURL string) *model.AppError { +func AddUserToTeamByTeamId(teamId string, user *model.User) *model.AppError { if result := <-Srv.Store.Team().Get(teamId); result.Err != nil { return result.Err } else { - return JoinUserToTeam(result.Data.(*model.Team), user, siteURL) + return JoinUserToTeam(result.Data.(*model.Team), user) } } -func AddUserToTeamByHash(userId string, hash string, data string, siteURL string) (*model.Team, *model.AppError) { +func AddUserToTeamByHash(userId string, hash string, data string) (*model.Team, *model.AppError) { props := model.MapFromJson(strings.NewReader(data)) if !model.ComparePassword(hash, fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) { @@ -223,14 +223,14 @@ func AddUserToTeamByHash(userId string, hash string, data string, siteURL string user = result.Data.(*model.User) } - if err := JoinUserToTeam(team, user, siteURL); err != nil { + if err := JoinUserToTeam(team, user); err != nil { return nil, err } return team, nil } -func AddUserToTeamByInviteId(inviteId string, userId string, siteURL string) (*model.Team, *model.AppError) { +func AddUserToTeamByInviteId(inviteId string, userId string) (*model.Team, *model.AppError) { tchan := Srv.Store.Team().GetByInviteId(inviteId) uchan := Srv.Store.User().Get(userId) @@ -248,7 +248,7 @@ func AddUserToTeamByInviteId(inviteId string, userId string, siteURL string) (*m user = result.Data.(*model.User) } - if err := JoinUserToTeam(team, user, siteURL); err != nil { + if err := JoinUserToTeam(team, user); err != nil { return nil, err } @@ -293,7 +293,7 @@ func joinUserToTeam(team *model.Team, user *model.User) (bool, *model.AppError) return false, nil } -func JoinUserToTeam(team *model.Team, user *model.User, siteURL string) *model.AppError { +func JoinUserToTeam(team *model.Team, user *model.User) *model.AppError { if alreadyAdded, err := joinUserToTeam(team, user); err != nil { return err @@ -308,7 +308,7 @@ func JoinUserToTeam(team *model.Team, user *model.User, siteURL string) *model.A } // Soft error if there is an issue joining the default channels - if err := JoinDefaultChannels(team.Id, user, channelRole, siteURL); err != nil { + if err := JoinDefaultChannels(team.Id, user, channelRole); err != nil { l4g.Error(utils.T("api.user.create_user.joining.error"), user.Id, team.Id, err) } @@ -431,8 +431,8 @@ func GetTeamMembersByIds(teamId string, userIds []string) ([]*model.TeamMember, } } -func AddTeamMember(teamId, userId, siteURL string) (*model.TeamMember, *model.AppError) { - if _, err := AddUserToTeam(teamId, userId, siteURL); err != nil { +func AddTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError) { + if _, err := AddUserToTeam(teamId, userId); err != nil { return nil, err } @@ -450,11 +450,11 @@ func AddTeamMember(teamId, userId, siteURL string) (*model.TeamMember, *model.Ap return teamMember, nil } -func AddTeamMembers(teamId string, userIds []string, siteURL string) ([]*model.TeamMember, *model.AppError) { +func AddTeamMembers(teamId string, userIds []string) ([]*model.TeamMember, *model.AppError) { var members []*model.TeamMember for _, userId := range userIds { - if _, err := AddUserToTeam(teamId, userId, siteURL); err != nil { + if _, err := AddUserToTeam(teamId, userId); err != nil { return nil, err } @@ -473,11 +473,11 @@ func AddTeamMembers(teamId string, userIds []string, siteURL string) ([]*model.T return members, nil } -func AddTeamMemberByHash(userId, hash, data, siteURL string) (*model.TeamMember, *model.AppError) { +func AddTeamMemberByHash(userId, hash, data string) (*model.TeamMember, *model.AppError) { var team *model.Team var err *model.AppError - if team, err = AddUserToTeamByHash(userId, hash, data, siteURL); err != nil { + if team, err = AddUserToTeamByHash(userId, hash, data); err != nil { return nil, err } @@ -488,11 +488,11 @@ func AddTeamMemberByHash(userId, hash, data, siteURL string) (*model.TeamMember, } } -func AddTeamMemberByInviteId(inviteId, userId, siteURL string) (*model.TeamMember, *model.AppError) { +func AddTeamMemberByInviteId(inviteId, userId string) (*model.TeamMember, *model.AppError) { var team *model.Team var err *model.AppError - if team, err = AddUserToTeamByInviteId(inviteId, userId, siteURL); err != nil { + if team, err = AddUserToTeamByInviteId(inviteId, userId); err != nil { return nil, err } @@ -610,7 +610,7 @@ func LeaveTeam(team *model.Team, user *model.User) *model.AppError { return nil } -func InviteNewUsersToTeam(emailList []string, teamId, senderId, siteURL string) *model.AppError { +func InviteNewUsersToTeam(emailList []string, teamId, senderId string) *model.AppError { if len(emailList) == 0 { err := model.NewLocAppError("InviteNewUsersToTeam", "api.team.invite_members.no_one.app_error", nil, "") err.StatusCode = http.StatusBadRequest @@ -634,7 +634,7 @@ func InviteNewUsersToTeam(emailList []string, teamId, senderId, siteURL string) user = result.Data.(*model.User) } - SendInviteEmails(team, user.GetDisplayName(), emailList, siteURL) + SendInviteEmails(team, user.GetDisplayName(), emailList, utils.GetSiteURL()) return nil } diff --git a/app/team_test.go b/app/team_test.go index 75f09f1ca..64af0c4af 100644 --- a/app/team_test.go +++ b/app/team_test.go @@ -8,7 +8,6 @@ import ( "testing" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" ) func TestCreateTeam(t *testing.T) { @@ -43,12 +42,12 @@ func TestCreateTeamWithUser(t *testing.T) { Type: model.TEAM_OPEN, } - if _, err := CreateTeamWithUser(team, th.BasicUser.Id, utils.GetSiteURL()); err != nil { + if _, err := CreateTeamWithUser(team, th.BasicUser.Id); err != nil { t.Log(err) t.Fatal("Should create a new team with existing user") } - if _, err := CreateTeamWithUser(team, model.NewId(), utils.GetSiteURL()); err == nil { + if _, err := CreateTeamWithUser(team, model.NewId()); err == nil { t.Fatal("Should not create a new team - user does not exist") } @@ -64,7 +63,7 @@ func TestCreateTeamWithUser(t *testing.T) { } //Fail to create a team with user when user has set email without domain - if _, err := CreateTeamWithUser(team2, ruser.Id, utils.GetSiteURL()); err == nil { + if _, err := CreateTeamWithUser(team2, ruser.Id); err == nil { t.Log(err.Message) t.Fatal("Should not create a team with user when user has set email without domain") } else { @@ -96,7 +95,7 @@ func TestAddUserToTeam(t *testing.T) { user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@example.com", Nickname: "Darth Vader", Username: "vader" + model.NewId(), Password: "passwd1", AuthService: ""} ruser, _ := CreateUser(&user) - if _, err := AddUserToTeam(th.BasicTeam.Id, ruser.Id, utils.GetSiteURL()); err != nil { + if _, err := AddUserToTeam(th.BasicTeam.Id, ruser.Id); err != nil { t.Log(err) t.Fatal("Should add user to the team") } @@ -108,7 +107,7 @@ func TestAddUserToTeamByTeamId(t *testing.T) { user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@example.com", Nickname: "Darth Vader", Username: "vader" + model.NewId(), Password: "passwd1", AuthService: ""} ruser, _ := CreateUser(&user) - if err := AddUserToTeamByTeamId(th.BasicTeam.Id, ruser, utils.GetSiteURL()); err != nil { + if err := AddUserToTeamByTeamId(th.BasicTeam.Id, ruser); err != nil { t.Log(err) t.Fatal("Should add user to the team") } diff --git a/app/user.go b/app/user.go index 00f6df471..d995e90fe 100644 --- a/app/user.go +++ b/app/user.go @@ -30,7 +30,7 @@ import ( "github.com/mattermost/platform/utils" ) -func CreateUserWithHash(user *model.User, hash string, data string, siteURL string) (*model.User, *model.AppError) { +func CreateUserWithHash(user *model.User, hash string, data string) (*model.User, *model.AppError) { if err := IsUserSignUpAllowed(); err != nil { return nil, err } @@ -63,7 +63,7 @@ func CreateUserWithHash(user *model.User, hash string, data string, siteURL stri return nil, err } - if err := JoinUserToTeam(team, ruser, siteURL); err != nil { + if err := JoinUserToTeam(team, ruser); err != nil { return nil, err } @@ -72,7 +72,7 @@ func CreateUserWithHash(user *model.User, hash string, data string, siteURL stri return ruser, nil } -func CreateUserWithInviteId(user *model.User, inviteId string, siteURL string) (*model.User, *model.AppError) { +func CreateUserWithInviteId(user *model.User, inviteId string) (*model.User, *model.AppError) { if err := IsUserSignUpAllowed(); err != nil { return nil, err } @@ -92,33 +92,33 @@ func CreateUserWithInviteId(user *model.User, inviteId string, siteURL string) ( return nil, err } - if err := JoinUserToTeam(team, ruser, siteURL); err != nil { + if err := JoinUserToTeam(team, ruser); err != nil { return nil, err } AddDirectChannels(team.Id, ruser) - if err := SendWelcomeEmail(ruser.Id, ruser.Email, ruser.EmailVerified, ruser.Locale, siteURL); err != nil { + if err := SendWelcomeEmail(ruser.Id, ruser.Email, ruser.EmailVerified, ruser.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } return ruser, nil } -func CreateUserAsAdmin(user *model.User, siteURL string) (*model.User, *model.AppError) { +func CreateUserAsAdmin(user *model.User) (*model.User, *model.AppError) { ruser, err := CreateUser(user) if err != nil { return nil, err } - if err := SendWelcomeEmail(ruser.Id, ruser.Email, ruser.EmailVerified, ruser.Locale, siteURL); err != nil { + if err := SendWelcomeEmail(ruser.Id, ruser.Email, ruser.EmailVerified, ruser.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } return ruser, nil } -func CreateUserFromSignup(user *model.User, siteURL string) (*model.User, *model.AppError) { +func CreateUserFromSignup(user *model.User) (*model.User, *model.AppError) { if err := IsUserSignUpAllowed(); err != nil { return nil, err } @@ -136,7 +136,7 @@ func CreateUserFromSignup(user *model.User, siteURL string) (*model.User, *model return nil, err } - if err := SendWelcomeEmail(ruser.Id, ruser.Email, ruser.EmailVerified, ruser.Locale, siteURL); err != nil { + if err := SendWelcomeEmail(ruser.Id, ruser.Email, ruser.EmailVerified, ruser.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } @@ -230,7 +230,7 @@ func createUser(user *model.User) (*model.User, *model.AppError) { } } -func CreateOAuthUser(service string, userData io.Reader, teamId string, siteURL string) (*model.User, *model.AppError) { +func CreateOAuthUser(service string, userData io.Reader, teamId string) (*model.User, *model.AppError) { if !utils.Cfg.TeamSettings.EnableUserCreation { return nil, model.NewAppError("CreateOAuthUser", "api.user.create_user.disabled.app_error", nil, "", http.StatusNotImplemented) } @@ -282,7 +282,7 @@ func CreateOAuthUser(service string, userData io.Reader, teamId string, siteURL } if len(teamId) > 0 { - err = AddUserToTeamByTeamId(teamId, user, siteURL) + err = AddUserToTeamByTeamId(teamId, user) if err != nil { return nil, err } @@ -841,7 +841,7 @@ func SetProfileImage(userId string, imageData *multipart.FileHeader) *model.AppE return nil } -func UpdatePasswordAsUser(userId, currentPassword, newPassword, siteURL string) *model.AppError { +func UpdatePasswordAsUser(userId, currentPassword, newPassword string) *model.AppError { var user *model.User var err *model.AppError @@ -868,7 +868,7 @@ func UpdatePasswordAsUser(userId, currentPassword, newPassword, siteURL string) T := utils.GetUserTranslations(user.Locale) - if err := UpdatePasswordSendEmail(user, newPassword, T("api.user.update_password.menu"), siteURL); err != nil { + if err := UpdatePasswordSendEmail(user, newPassword, T("api.user.update_password.menu")); err != nil { return err } @@ -934,8 +934,8 @@ func SanitizeProfile(user *model.User, asAdmin bool) { user.SanitizeProfile(options) } -func UpdateUserAsUser(user *model.User, siteURL string, asAdmin bool) (*model.User, *model.AppError) { - updatedUser, err := UpdateUser(user, siteURL, true) +func UpdateUserAsUser(user *model.User, asAdmin bool) (*model.User, *model.AppError) { + updatedUser, err := UpdateUser(user, true) if err != nil { return nil, err } @@ -947,7 +947,7 @@ func UpdateUserAsUser(user *model.User, siteURL string, asAdmin bool) (*model.Us return updatedUser, nil } -func PatchUser(userId string, patch *model.UserPatch, siteURL string, asAdmin bool) (*model.User, *model.AppError) { +func PatchUser(userId string, patch *model.UserPatch, asAdmin bool) (*model.User, *model.AppError) { user, err := GetUser(userId) if err != nil { return nil, err @@ -955,7 +955,7 @@ func PatchUser(userId string, patch *model.UserPatch, siteURL string, asAdmin bo user.Patch(patch) - updatedUser, err := UpdateUser(user, siteURL, true) + updatedUser, err := UpdateUser(user, true) if err != nil { return nil, err } @@ -975,7 +975,7 @@ func sendUpdatedUserEvent(user *model.User) { go Publish(message) } -func UpdateUser(user *model.User, siteURL string, sendNotifications bool) (*model.User, *model.AppError) { +func UpdateUser(user *model.User, sendNotifications bool) (*model.User, *model.AppError) { if result := <-Srv.Store.User().Update(user, false); result.Err != nil { return nil, result.Err } else { @@ -984,14 +984,14 @@ func UpdateUser(user *model.User, siteURL string, sendNotifications bool) (*mode if sendNotifications { if rusers[0].Email != rusers[1].Email { go func() { - if err := SendEmailChangeEmail(rusers[1].Email, rusers[0].Email, rusers[0].Locale, siteURL); err != nil { + if err := SendEmailChangeEmail(rusers[1].Email, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() if utils.Cfg.EmailSettings.RequireEmailVerification { go func() { - if err := SendEmailChangeVerifyEmail(rusers[0].Id, rusers[0].Email, rusers[0].Locale, siteURL); err != nil { + if err := SendEmailChangeVerifyEmail(rusers[0].Id, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1000,7 +1000,7 @@ func UpdateUser(user *model.User, siteURL string, sendNotifications bool) (*mode if rusers[0].Username != rusers[1].Username { go func() { - if err := SendChangeUsernameEmail(rusers[1].Username, rusers[0].Username, rusers[0].Email, rusers[0].Locale, siteURL); err != nil { + if err := SendChangeUsernameEmail(rusers[1].Username, rusers[0].Username, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1013,7 +1013,7 @@ func UpdateUser(user *model.User, siteURL string, sendNotifications bool) (*mode } } -func UpdateUserNotifyProps(userId string, props map[string]string, siteURL string) (*model.User, *model.AppError) { +func UpdateUserNotifyProps(userId string, props map[string]string) (*model.User, *model.AppError) { var user *model.User var err *model.AppError if user, err = GetUser(userId); err != nil { @@ -1023,14 +1023,14 @@ func UpdateUserNotifyProps(userId string, props map[string]string, siteURL strin user.NotifyProps = props var ruser *model.User - if ruser, err = UpdateUser(user, siteURL, true); err != nil { + if ruser, err = UpdateUser(user, true); err != nil { return nil, err } return ruser, nil } -func UpdateMfa(activate bool, userId, token, siteUrl string) *model.AppError { +func UpdateMfa(activate bool, userId, token string) *model.AppError { if activate { if err := ActivateMfa(userId, token); err != nil { return err @@ -1050,7 +1050,7 @@ func UpdateMfa(activate bool, userId, token, siteUrl string) *model.AppError { return } - if err := SendMfaChangeEmail(user.Email, activate, user.Locale, siteUrl); err != nil { + if err := SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1058,14 +1058,14 @@ func UpdateMfa(activate bool, userId, token, siteUrl string) *model.AppError { return nil } -func UpdatePasswordByUserIdSendEmail(userId, newPassword, method, siteURL string) *model.AppError { +func UpdatePasswordByUserIdSendEmail(userId, newPassword, method string) *model.AppError { var user *model.User var err *model.AppError if user, err = GetUser(userId); err != nil { return err } - return UpdatePasswordSendEmail(user, newPassword, method, siteURL) + return UpdatePasswordSendEmail(user, newPassword, method) } func UpdatePassword(user *model.User, newPassword string) *model.AppError { @@ -1082,13 +1082,13 @@ func UpdatePassword(user *model.User, newPassword string) *model.AppError { return nil } -func UpdatePasswordSendEmail(user *model.User, newPassword, method, siteURL string) *model.AppError { +func UpdatePasswordSendEmail(user *model.User, newPassword, method string) *model.AppError { if err := UpdatePassword(user, newPassword); err != nil { return err } go func() { - if err := SendPasswordChangeEmail(user.Email, method, user.Locale, siteURL); err != nil { + if err := SendPasswordChangeEmail(user.Email, method, user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1096,7 +1096,7 @@ func UpdatePasswordSendEmail(user *model.User, newPassword, method, siteURL stri return nil } -func ResetPasswordFromCode(code, newPassword, siteURL string) *model.AppError { +func ResetPasswordFromCode(code, newPassword string) *model.AppError { var recovery *model.PasswordRecovery var err *model.AppError if recovery, err = GetPasswordRecovery(code); err != nil { @@ -1118,7 +1118,7 @@ func ResetPasswordFromCode(code, newPassword, siteURL string) *model.AppError { T := utils.GetUserTranslations(user.Locale) - if err := UpdatePasswordSendEmail(user, newPassword, T("api.user.reset_password.method"), siteURL); err != nil { + if err := UpdatePasswordSendEmail(user, newPassword, T("api.user.reset_password.method")); err != nil { return err } @@ -1427,7 +1427,7 @@ func AutocompleteUsersInTeam(teamId string, term string, searchOptions map[strin return autocomplete, nil } -func UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provider einterfaces.OauthProvider, service string, siteURL string) *model.AppError { +func UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provider einterfaces.OauthProvider, service string) *model.AppError { oauthUser := provider.GetUserFromJson(userData) if oauthUser == nil { diff --git a/app/user_test.go b/app/user_test.go index d8d6bdc79..ff9e4d500 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -70,7 +70,7 @@ func TestCreateOAuthUser(t *testing.T) { glUser := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)), Username: "joram" + model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"} json := glUser.ToJson() - user, err := CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id, utils.GetSiteURL()) + user, err := CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id) if err != nil { t.Fatal(err) } @@ -87,7 +87,7 @@ func TestCreateOAuthUser(t *testing.T) { }() utils.Cfg.TeamSettings.EnableUserCreation = false - _, err = CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id, utils.GetSiteURL()) + _, err = CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id) if err == nil { t.Fatal("should have failed - user creation disabled") } @@ -138,7 +138,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) { data := bytes.NewReader(gitlabUser) user = getUserFromDB(user.Id, t) - UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab", "http://localhost:8065") + UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab") user = getUserFromDB(user.Id, t) if user.Username != gitlabUserObj.Username { @@ -153,7 +153,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) { data := bytes.NewReader(gitlabUser) user = getUserFromDB(user.Id, t) - UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab", "http://localhost:8065") + UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab") user = getUserFromDB(user.Id, t) if user.Username == gitlabUserObj.Username { @@ -169,7 +169,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) { data := bytes.NewReader(gitlabUser) user = getUserFromDB(user.Id, t) - UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab", "http://localhost:8065") + UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab") user = getUserFromDB(user.Id, t) if user.Email != gitlabUserObj.Email { @@ -188,7 +188,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) { data := bytes.NewReader(gitlabUser) user = getUserFromDB(user.Id, t) - UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab", "http://localhost:8065") + UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab") user = getUserFromDB(user.Id, t) if user.Email == gitlabUserObj.Email { @@ -203,7 +203,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) { data := bytes.NewReader(gitlabUser) user = getUserFromDB(user.Id, t) - UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab", "http://localhost:8065") + UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab") user = getUserFromDB(user.Id, t) if user.FirstName != "Updated" { @@ -217,7 +217,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) { data := bytes.NewReader(gitlabUser) user = getUserFromDB(user.Id, t) - UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab", "http://localhost:8065") + UpdateOAuthUserAttrs(data, user, gitlabProvider, "gitlab") user = getUserFromDB(user.Id, t) if user.LastName != "Lastname" { @@ -253,7 +253,7 @@ func createGitlabUser(t *testing.T, email string, username string) (*model.User, var user *model.User var err *model.AppError - if user, err = CreateOAuthUser("gitlab", bytes.NewReader(gitlabUser), "", utils.GetSiteURL()); err != nil { + if user, err = CreateOAuthUser("gitlab", bytes.NewReader(gitlabUser), ""); err != nil { t.Fatal("unable to create the user") } diff --git a/app/webhook.go b/app/webhook.go index c3853b97b..0ec06365d 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -24,7 +24,7 @@ const ( TRIGGERWORDS_STARTSWITH = 1 ) -func handleWebhookEvents(post *model.Post, team *model.Team, channel *model.Channel, user *model.User, siteURL string) *model.AppError { +func handleWebhookEvents(post *model.Post, team *model.Team, channel *model.Channel, user *model.User) *model.AppError { if !utils.Cfg.ServiceSettings.EnableOutgoingWebhooks { return nil } @@ -107,7 +107,7 @@ func handleWebhookEvents(post *model.Post, team *model.Team, channel *model.Chan respProps := model.MapFromJson(resp.Body) if text, ok := respProps["text"]; ok { - if _, err := CreateWebhookPost(hook.CreatorId, hook.TeamId, post.ChannelId, text, respProps["username"], respProps["icon_url"], post.Props, post.Type, siteURL); err != nil { + if _, err := CreateWebhookPost(hook.CreatorId, hook.TeamId, post.ChannelId, text, respProps["username"], respProps["icon_url"], post.Props, post.Type); err != nil { l4g.Error(utils.T("api.post.handle_webhook_events_and_forget.create_post.error"), err) } } @@ -121,7 +121,7 @@ func handleWebhookEvents(post *model.Post, team *model.Team, channel *model.Chan return nil } -func CreateWebhookPost(userId, teamId, channelId, text, overrideUsername, overrideIconUrl string, props model.StringInterface, postType string, siteURL string) (*model.Post, *model.AppError) { +func CreateWebhookPost(userId, teamId, channelId, text, overrideUsername, overrideIconUrl string, props model.StringInterface, postType string) (*model.Post, *model.AppError) { // parse links into Markdown format linkWithTextRegex := regexp.MustCompile(`<([^<\|]+)\|([^>]+)>`) text = linkWithTextRegex.ReplaceAllString(text, "[${2}](${1})") @@ -159,7 +159,7 @@ func CreateWebhookPost(userId, teamId, channelId, text, overrideUsername, overri } } - if _, err := CreatePost(post, teamId, false, siteURL); err != nil { + if _, err := CreatePost(post, teamId, false); err != nil { return nil, model.NewLocAppError("CreateWebhookPost", "api.post.create_webhook_post.creating.app_error", nil, "err="+err.Message) } @@ -423,7 +423,7 @@ func RegenOutgoingWebhookToken(hook *model.OutgoingWebhook) (*model.OutgoingWebh } } -func HandleIncomingWebhook(hookId string, req *model.IncomingWebhookRequest, siteURL string) *model.AppError { +func HandleIncomingWebhook(hookId string, req *model.IncomingWebhookRequest) *model.AppError { if !utils.Cfg.ServiceSettings.EnableIncomingWebhooks { return model.NewAppError("HandleIncomingWebhook", "web.incoming_webhook.disabled.app_error", nil, "", http.StatusNotImplemented) } @@ -514,7 +514,7 @@ func HandleIncomingWebhook(hookId string, req *model.IncomingWebhookRequest, sit return model.NewAppError("HandleIncomingWebhook", "web.incoming_webhook.permissions.app_error", nil, "", http.StatusForbidden) } - if _, err := CreateWebhookPost(hook.UserId, hook.TeamId, channel.Id, text, overrideUsername, overrideIconUrl, req.Props, webhookType, siteURL); err != nil { + if _, err := CreateWebhookPost(hook.UserId, hook.TeamId, channel.Id, text, overrideUsername, overrideIconUrl, req.Props, webhookType); err != nil { return err } -- cgit v1.2.3-1-g7c22