diff options
author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /app/user.go | |
parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'app/user.go')
-rw-r--r-- | app/user.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/user.go b/app/user.go index c872a7fa1..c877640d6 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 } |