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/user.go | 64 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'app/user.go') 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 { -- cgit v1.2.3-1-g7c22