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 --- api/admin.go | 2 +- api/apitestlib.go | 2 +- api/channel.go | 16 ++++++++-------- api/command.go | 2 +- api/context.go | 26 +++++++++++--------------- api/context_test.go | 8 ++++---- api/file.go | 2 +- api/oauth.go | 16 ++++++++-------- api/post.go | 4 ++-- api/team.go | 10 +++++----- api/user.go | 40 ++++++++++++++++++++-------------------- api/webhook.go | 2 +- 12 files changed, 63 insertions(+), 67 deletions(-) (limited to 'api') diff --git a/api/admin.go b/api/admin.go index 59890c739..cb1b7efde 100644 --- a/api/admin.go +++ b/api/admin.go @@ -311,7 +311,7 @@ func adminResetPassword(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := app.UpdatePasswordByUserIdSendEmail(userId, newPassword, c.T("api.user.reset_password.method"), c.GetSiteURL()); err != nil { + if err := app.UpdatePasswordByUserIdSendEmail(userId, newPassword, c.T("api.user.reset_password.method")); err != nil { c.Err = err return } diff --git a/api/apitestlib.go b/api/apitestlib.go index f1d06ec0f..e6d57503f 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -163,7 +163,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, utils.GetSiteURL()) + err := app.JoinUserToTeam(team, user) if err != nil { l4g.Error(err.Error()) l4g.Close() diff --git a/api/channel.go b/api/channel.go index d408e9478..0db3499e0 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, c.GetSiteURL()); err != nil { + if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelDisplayName, channel.DisplayName); 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, c.GetSiteURL()); err != nil { + if err := app.PostUpdateChannelHeaderMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelHeader, channelHeader); 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, c.GetSiteURL()); err != nil { + if err := app.PostUpdateChannelPurposeMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelPurpose, channelPurpose); 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, c.GetSiteURL()); err != nil { + if err = app.JoinChannel(channel, c.Session.UserId); 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, c.GetSiteURL()) + err := app.LeaveChannel(id, c.Session.UserId) 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, c.GetSiteURL()) + err = app.DeleteChannel(channel, c.Session.UserId) 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, c.GetSiteURL()) + go app.PostAddToChannelMessage(oUser, nUser, channel) 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, c.GetSiteURL()); err != nil { + if err = app.RemoveUserFromChannel(userIdToRemove, c.Session.UserId, channel); err != nil { c.Err = err return } diff --git a/api/command.go b/api/command.go index b97295160..75f37b9ff 100644 --- a/api/command.go +++ b/api/command.go @@ -66,7 +66,7 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) { commandArgs.UserId = c.Session.UserId commandArgs.T = c.T commandArgs.Session = c.Session - commandArgs.SiteURL = c.GetSiteURL() + commandArgs.SiteURL = c.GetSiteURLHeader() response, err := app.ExecuteCommand(commandArgs) if err != nil { diff --git a/api/context.go b/api/context.go index 1b251eb53..ff6018920 100644 --- a/api/context.go +++ b/api/context.go @@ -26,7 +26,7 @@ type Context struct { IpAddress string Path string Err *model.AppError - siteURL string + siteURLHeader string teamURLValid bool teamURL string T goi18n.TranslateFunc @@ -146,12 +146,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)) @@ -191,11 +186,11 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if h.isApi || h.isTeamIndependent { - c.setTeamURL(c.GetSiteURL(), false) + c.setTeamURL(c.GetSiteURLHeader(), false) c.Path = r.URL.Path } else { splitURL := strings.Split(r.URL.Path, "/") - c.setTeamURL(c.GetSiteURL()+"/"+splitURL[1], true) + c.setTeamURL(c.GetSiteURLHeader()+"/"+splitURL[1], true) c.Path = "/" + strings.Join(splitURL[2:], "/") } @@ -391,16 +386,17 @@ func (c *Context) setTeamURL(url string, valid bool) { func (c *Context) SetTeamURLFromSession() { if result := <-app.Srv.Store.Team().Get(c.TeamId); result.Err == nil { - c.setTeamURL(c.GetSiteURL()+"/"+result.Data.(*model.Team).Name, true) + c.setTeamURL(c.GetSiteURLHeader()+"/"+result.Data.(*model.Team).Name, true) } } -func (c *Context) SetSiteURL(url string) { - c.siteURL = strings.TrimRight(url, "/") +func (c *Context) SetSiteURLHeader(url string) { + c.siteURLHeader = strings.TrimRight(url, "/") } +// TODO see where these are used func (c *Context) GetTeamURLFromTeam(team *model.Team) string { - return c.GetSiteURL() + "/" + team.Name + return c.GetSiteURLHeader() + "/" + team.Name } func (c *Context) GetTeamURL() string { @@ -413,8 +409,8 @@ func (c *Context) GetTeamURL() string { return c.teamURL } -func (c *Context) GetSiteURL() string { - return c.siteURL +func (c *Context) GetSiteURLHeader() string { + return c.siteURLHeader } func (c *Context) GetCurrentTeamMember() *model.TeamMember { diff --git a/api/context_test.go b/api/context_test.go index cd6ca01aa..cd4d058cf 100644 --- a/api/context_test.go +++ b/api/context_test.go @@ -7,7 +7,7 @@ import ( "testing" ) -func TestSiteURL(t *testing.T) { +func TestSiteURLHeader(t *testing.T) { c := &Context{} testCases := []struct { @@ -19,10 +19,10 @@ func TestSiteURL(t *testing.T) { } for _, tc := range testCases { - c.SetSiteURL(tc.url) + c.SetSiteURLHeader(tc.url) - if c.siteURL != tc.want { - t.Fatalf("expected %s, got %s", tc.want, c.siteURL) + if c.siteURLHeader != tc.want { + t.Fatalf("expected %s, got %s", tc.want, c.siteURLHeader) } } diff --git a/api/file.go b/api/file.go index 12219a2dc..54df78dd7 100644 --- a/api/file.go +++ b/api/file.go @@ -316,5 +316,5 @@ func getPublicLink(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write([]byte(model.StringToJson(app.GeneratePublicLinkV3(c.GetSiteURL(), info)))) + w.Write([]byte(model.StringToJson(app.GeneratePublicLinkV3(c.GetSiteURLHeader(), info)))) } diff --git a/api/oauth.go b/api/oauth.go index 754c49564..4a71500c4 100644 --- a/api/oauth.go +++ b/api/oauth.go @@ -271,7 +271,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { state := r.URL.Query().Get("state") - uri := c.GetSiteURL() + "/signup/" + service + "/complete" + uri := c.GetSiteURLHeader() + "/signup/" + service + "/complete" if body, teamId, props, err := AuthorizeOAuthUser(service, code, state, uri); err != nil { c.Err = err @@ -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, c.GetSiteURL()); err != nil { + if user, err := app.CreateOAuthUser(service, body, teamId); err != nil { c.Err = err } else { doLogin(c, w, r, user, "") @@ -297,11 +297,11 @@ 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.GetSiteURL()) + c.Err = app.AddUserToTeamByTeamId(teamId, user) } if c.Err == nil { if val, ok := props["redirect_to"]; ok { - http.Redirect(w, r, c.GetSiteURL()+val, http.StatusTemporaryRedirect) + http.Redirect(w, r, c.GetSiteURLHeader()+val, http.StatusTemporaryRedirect) return } http.Redirect(w, r, app.GetProtocol(r)+"://"+r.Host, http.StatusTemporaryRedirect) @@ -361,7 +361,7 @@ func authorizeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { // here we should check if the user is logged in if len(c.Session.UserId) == 0 { - http.Redirect(w, r, c.GetSiteURL()+"/login?redirect_to="+url.QueryEscape(r.RequestURI), http.StatusFound) + http.Redirect(w, r, c.GetSiteURLHeader()+"/login?redirect_to="+url.QueryEscape(r.RequestURI), http.StatusFound) return } @@ -382,7 +382,7 @@ func authorizeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { doAllow := func() (*http.Response, *model.AppError) { HttpClient := &http.Client{} - url := c.GetSiteURL() + "/api/v3/oauth/allow?response_type=" + model.AUTHCODE_RESPONSE_TYPE + "&client_id=" + clientId + "&redirect_uri=" + url.QueryEscape(redirect) + "&scope=" + scope + "&state=" + url.QueryEscape(state) + url := c.GetSiteURLHeader() + "/api/v3/oauth/allow?response_type=" + model.AUTHCODE_RESPONSE_TYPE + "&client_id=" + clientId + "&redirect_uri=" + url.QueryEscape(redirect) + "&scope=" + scope + "&state=" + url.QueryEscape(state) rq, _ := http.NewRequest("GET", url, strings.NewReader("")) rq.Header.Set(model.HEADER_AUTH, model.HEADER_BEARER+" "+c.Session.Token) @@ -702,7 +702,7 @@ func GetAuthorizationCode(c *Context, service string, props map[string]string, l props["hash"] = model.HashPassword(clientId) state := b64.StdEncoding.EncodeToString([]byte(model.MapToJson(props))) - redirectUri := c.GetSiteURL() + "/signup/" + service + "/complete" + redirectUri := c.GetSiteURLHeader() + "/signup/" + service + "/complete" authUrl := endpoint + "?response_type=code&client_id=" + clientId + "&redirect_uri=" + url.QueryEscape(redirectUri) + "&state=" + url.QueryEscape(state) @@ -842,7 +842,7 @@ func CompleteSwitchWithOAuth(c *Context, w http.ResponseWriter, r *http.Request, } go func() { - if err := app.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, c.GetSiteURL()); err != nil { + if err := app.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() diff --git a/api/post.go b/api/post.go index b4c34bca2..27efcd44c 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, c.GetSiteURL()) + rp, err := app.CreatePostAsUser(post) if err != nil { c.Err = err return @@ -344,7 +344,7 @@ func getPermalinkTmp(c *Context, w http.ResponseWriter, r *http.Request) { } } - if list, err := app.GetPermalinkPost(postId, c.Session.UserId, c.GetSiteURL()); err != nil { + if list, err := app.GetPermalinkPost(postId, c.Session.UserId); 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 dda3b9d9d..ed46947a4 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, c.GetSiteURL()) + rteam, err := app.CreateTeamWithUser(team, c.Session.UserId) if err != nil { c.Err = err return @@ -131,7 +131,7 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := app.InviteNewUsersToTeam(invites.ToEmailList(), c.TeamId, c.Session.UserId, c.GetSiteURL()); err != nil { + if err := app.InviteNewUsersToTeam(invites.ToEmailList(), c.TeamId, c.Session.UserId); 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, c.GetSiteURL()); err != nil { + if _, err := app.AddUserToTeam(c.TeamId, userId); 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, c.GetSiteURL()) + team, err = app.AddUserToTeamByHash(c.Session.UserId, hash, data) } else if len(inviteId) > 0 { - team, err = app.AddUserToTeamByInviteId(inviteId, c.Session.UserId, c.GetSiteURL()) + team, err = app.AddUserToTeamByInviteId(inviteId, c.Session.UserId) } 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 f5bed17ca..7f422b355 100644 --- a/api/user.go +++ b/api/user.go @@ -87,11 +87,11 @@ 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 { - ruser, err = app.CreateUserFromSignup(user, c.GetSiteURL()) + ruser, err = app.CreateUserFromSignup(user) } if err != nil { @@ -156,7 +156,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()), "", c.GetSiteURL()); err != nil { + if user, err = app.CreateOAuthUser(service, bytes.NewReader(buf.Bytes()), ""); err != nil { c.Err = err return nil } @@ -165,7 +165,7 @@ func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service st return nil } - if err = app.UpdateOAuthUserAttrs(bytes.NewReader(buf.Bytes()), user, provider, service, c.siteURL); err != nil { + if err = app.UpdateOAuthUserAttrs(bytes.NewReader(buf.Bytes()), user, provider, service); err != nil { c.Err = err return nil } @@ -686,7 +686,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 { @@ -719,7 +719,7 @@ func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := app.UpdatePasswordAsUser(userId, currentPassword, newPassword, c.GetSiteURL()); err != nil { + if err := app.UpdatePasswordAsUser(userId, currentPassword, newPassword); err != nil { c.LogAudit("failed") c.Err = err return @@ -801,7 +801,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 { @@ -824,7 +824,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 @@ -877,7 +877,7 @@ func updateUserNotify(c *Context, w http.ResponseWriter, r *http.Request) { return } - ruser, err := app.UpdateUserNotifyProps(userId, props, c.GetSiteURL()) + ruser, err := app.UpdateUserNotifyProps(userId, props) if err != nil { c.Err = err return @@ -936,7 +936,7 @@ func emailToOAuth(c *Context, w http.ResponseWriter, r *http.Request) { m := map[string]string{} if service == model.USER_AUTH_SERVICE_SAML { - m["follow_link"] = c.GetSiteURL() + "/login/sso/saml?action=" + model.OAUTH_ACTION_EMAIL_TO_SSO + "&email=" + email + m["follow_link"] = c.GetSiteURLHeader() + "/login/sso/saml?action=" + model.OAUTH_ACTION_EMAIL_TO_SSO + "&email=" + email } else { if authUrl, err := GetAuthorizationCode(c, service, stateProps, ""); err != nil { c.LogAuditWithUserId(user.Id, "fail - oauth issue") @@ -990,7 +990,7 @@ func oauthToEmail(c *Context, w http.ResponseWriter, r *http.Request) { } go func() { - if err := app.SendSignInChangeEmail(user.Email, c.T("api.templates.signin_change_email.body.method_email"), user.Locale, c.GetSiteURL()); err != nil { + if err := app.SendSignInChangeEmail(user.Email, c.T("api.templates.signin_change_email.body.method_email"), user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1083,7 +1083,7 @@ func emailToLdap(c *Context, w http.ResponseWriter, r *http.Request) { } go func() { - if err := app.SendSignInChangeEmail(user.Email, "AD/LDAP", user.Locale, c.GetSiteURL()); err != nil { + if err := app.SendSignInChangeEmail(user.Email, "AD/LDAP", user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1170,7 +1170,7 @@ func ldapToEmail(c *Context, w http.ResponseWriter, r *http.Request) { } go func() { - if err := app.SendSignInChangeEmail(user.Email, c.T("api.templates.signin_change_email.body.method_email"), user.Locale, c.GetSiteURL()); err != nil { + if err := app.SendSignInChangeEmail(user.Email, c.T("api.templates.signin_change_email.body.method_email"), user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1224,9 +1224,9 @@ func resendVerification(c *Context, w http.ResponseWriter, r *http.Request) { return } else { 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()) } } } @@ -1286,7 +1286,7 @@ func updateMfa(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := app.SendMfaChangeEmail(user.Email, activate, user.Locale, c.GetSiteURL()); err != nil { + if err := app.SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1391,7 +1391,7 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { relayProps = model.MapFromJson(strings.NewReader(stateStr)) } - if user, err := samlInterface.DoLogin(encodedXML, relayProps, c.GetSiteURL()); err != nil { + if user, err := samlInterface.DoLogin(encodedXML, relayProps); err != nil { c.Err = err c.Err.StatusCode = http.StatusFound return @@ -1416,7 +1416,7 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { } c.LogAuditWithUserId(user.Id, "Revoked all sessions for user") go func() { - if err := app.SendSignInChangeEmail(user.Email, strings.Title(model.USER_AUTH_SERVICE_SAML)+" SSO", user.Locale, c.GetSiteURL()); err != nil { + if err := app.SendSignInChangeEmail(user.Email, strings.Title(model.USER_AUTH_SERVICE_SAML)+" SSO", user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }() @@ -1428,7 +1428,7 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { } if val, ok := relayProps["redirect_to"]; ok { - http.Redirect(w, r, c.GetSiteURL()+val, http.StatusFound) + http.Redirect(w, r, c.GetSiteURLHeader()+val, http.StatusFound) return } diff --git a/api/webhook.go b/api/webhook.go index a86af98c0..12751943e 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, c.GetSiteURL()) + err := app.HandleIncomingWebhook(id, parsedRequest) if err != nil { c.Err = err return -- cgit v1.2.3-1-g7c22