diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-17 07:54:30 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-17 07:54:30 -0400 |
| commit | 1bb2e5a2170b2dc8d97763e1a894ef04f82a94eb (patch) | |
| tree | 5289d756fee00d4b98c7ad4533782ef129387f24 | |
| parent | fd3a7afb3e746b8f57af9cdbe03393cd41bd03d4 (diff) | |
| parent | 1d37723307704752390c85d4c821ae46a94405eb (diff) | |
| download | chat-1bb2e5a2170b2dc8d97763e1a894ef04f82a94eb.tar.gz chat-1bb2e5a2170b2dc8d97763e1a894ef04f82a94eb.tar.bz2 chat-1bb2e5a2170b2dc8d97763e1a894ef04f82a94eb.zip | |
Merge pull request #700 from mattermost/GIT-698
Fixes GIT-698 allow ability to disable team creation for SSO
| -rw-r--r-- | api/team.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/team.go b/api/team.go index 44f86b160..92fcbff93 100644 --- a/api/team.go +++ b/api/team.go @@ -100,6 +100,10 @@ func createTeamFromSSO(c *Context, w http.ResponseWriter, r *http.Request) { return } + if !isTreamCreationAllowed(c, team.Email) { + return + } + team.PreSave() team.Name = model.CleanTeamName(team.Name) |