summaryrefslogtreecommitdiffstats
path: root/app/user.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-03-10 05:18:18 -0500
committerGeorge Goldberg <george@gberg.me>2017-03-10 10:18:18 +0000
commita8e68bd8905972ae59de90fa33d5b3e3c274dc47 (patch)
treec809d33800262830f2497813fcea2c5bb482ac1b /app/user.go
parent43e5bbea372cb2c4a98d00fae19cdabd165a8f48 (diff)
downloadchat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.gz
chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.bz2
chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.zip
PLT-5765 Passed SiteURL to SendNotifications (#5705)
Diffstat (limited to 'app/user.go')
-rw-r--r--app/user.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/user.go b/app/user.go
index d1ddceb23..d050e1524 100644
--- a/app/user.go
+++ b/app/user.go
@@ -29,7 +29,7 @@ import (
"github.com/mattermost/platform/utils"
)
-func CreateUserWithHash(user *model.User, hash string, data string) (*model.User, *model.AppError) {
+func CreateUserWithHash(user *model.User, hash string, data string, siteURL string) (*model.User, *model.AppError) {
if err := IsUserSignUpAllowed(); err != nil {
return nil, err
}
@@ -62,7 +62,7 @@ func CreateUserWithHash(user *model.User, hash string, data string) (*model.User
return nil, err
}
- if err := JoinUserToTeam(team, ruser); err != nil {
+ if err := JoinUserToTeam(team, ruser, siteURL); err != nil {
return nil, err
}
@@ -91,7 +91,7 @@ func CreateUserWithInviteId(user *model.User, inviteId string, siteURL string) (
return nil, err
}
- if err := JoinUserToTeam(team, ruser); err != nil {
+ if err := JoinUserToTeam(team, ruser, siteURL); err != nil {
return nil, err
}
@@ -216,7 +216,7 @@ func createUser(user *model.User) (*model.User, *model.AppError) {
}
}
-func CreateOAuthUser(service string, userData io.Reader, teamId string) (*model.User, *model.AppError) {
+func CreateOAuthUser(service string, userData io.Reader, teamId string, siteURL 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)
}
@@ -268,7 +268,7 @@ func CreateOAuthUser(service string, userData io.Reader, teamId string) (*model.
}
if len(teamId) > 0 {
- err = AddUserToTeamByTeamId(teamId, user)
+ err = AddUserToTeamByTeamId(teamId, user, siteURL)
if err != nil {
return nil, err
}