diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-22 01:15:41 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 01:15:41 -0700 |
commit | 08a3acbb44b043b9bb56f9b96e91432352d06d1a (patch) | |
tree | ceb451571691d0530ff2c97a033fcc206c42d3ea /api/user.go | |
parent | f05a2c03d5dbf5b0b7d09148a37d2325012b309f (diff) | |
download | chat-08a3acbb44b043b9bb56f9b96e91432352d06d1a.tar.gz chat-08a3acbb44b043b9bb56f9b96e91432352d06d1a.tar.bz2 chat-08a3acbb44b043b9bb56f9b96e91432352d06d1a.zip |
Adding team settings to admin console
Diffstat (limited to 'api/user.go')
-rw-r--r-- | api/user.go | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/api/user.go b/api/user.go index 7f4eb6c2d..ba5323d77 100644 --- a/api/user.go +++ b/api/user.go @@ -155,19 +155,13 @@ func IsVerifyHashRequired(user *model.User, team *model.Team, hash string) bool return shouldVerifyHash } -func CreateValet(c *Context, team *model.Team) *model.User { - valet := &model.User{} - valet.TeamId = team.Id - valet.Email = utils.Cfg.EmailSettings.FeedbackEmail - valet.EmailVerified = true - valet.Username = model.BOT_USERNAME - valet.Password = model.NewId() - - return CreateUser(c, team, valet) -} - func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { + if !utils.Cfg.TeamSettings.EnableUserCreation { + c.Err = model.NewAppError("CreateUser", "User creation has been disabled. Please ask your systems administrator for details.", "") + return nil + } + channelRole := "" if team.Email == user.Email { user.Roles = model.ROLE_TEAM_ADMIN |