From a8e68bd8905972ae59de90fa33d5b3e3c274dc47 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 10 Mar 2017 05:18:18 -0500 Subject: PLT-5765 Passed SiteURL to SendNotifications (#5705) --- api/user.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'api/user.go') diff --git a/api/user.go b/api/user.go index 183f4e100..cac6aeade 100644 --- a/api/user.go +++ b/api/user.go @@ -89,7 +89,7 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) { var ruser *model.User var err *model.AppError if len(hash) > 0 { - ruser, err = app.CreateUserWithHash(user, hash, r.URL.Query().Get("d")) + ruser, err = app.CreateUserWithHash(user, hash, r.URL.Query().Get("d"), c.GetSiteURL()) } else if len(inviteId) > 0 { ruser, err = app.CreateUserWithInviteId(user, inviteId, c.GetSiteURL()) } else { @@ -158,7 +158,7 @@ func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service st var err *model.AppError if user, err = app.GetUserByAuth(&authData, service); err != nil { if err.Id == store.MISSING_AUTH_ACCOUNT_ERROR { - if user, err = app.CreateOAuthUser(service, bytes.NewReader(buf.Bytes()), ""); err != nil { + if user, err = app.CreateOAuthUser(service, bytes.NewReader(buf.Bytes()), "", c.GetSiteURL()); err != nil { c.Err = err return nil } @@ -1411,7 +1411,7 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { relayProps = model.MapFromJson(strings.NewReader(stateStr)) } - if user, err := samlInterface.DoLogin(encodedXML, relayProps); err != nil { + if user, err := samlInterface.DoLogin(encodedXML, relayProps, c.GetSiteURL()); err != nil { c.Err = err c.Err.StatusCode = http.StatusFound return -- cgit v1.2.3-1-g7c22