diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
| commit | 5fa1b3581955761bd39c310bc88b1489d963a9fc (patch) | |
| tree | 25e6dd11592102807abebbb5de100f7d867005d8 /api/user.go | |
| parent | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (diff) | |
| parent | 87762ae62eb887dfb3fd0957040919aede46f7d4 (diff) | |
| download | chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.gz chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.bz2 chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'api/user.go')
| -rw-r--r-- | api/user.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index 14cc881dc..560d722a4 100644 --- a/api/user.go +++ b/api/user.go @@ -1170,7 +1170,11 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { teamId := relayProps["team_id"] if len(teamId) > 0 { c.App.Go(func() { - c.App.AddDirectChannels(teamId, user) + if err := c.App.AddUserToTeamByTeamId(teamId, user); err != nil { + l4g.Error(err.Error()) + } else { + c.App.AddDirectChannels(teamId, user) + } }) } case model.OAUTH_ACTION_EMAIL_TO_SSO: |