IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auto join teams if coming from team sign-up page to login for GitLab (#3284)

Browse Source
This commit is contained in:
Joram Wilander
2016-06-07 17:43:06 -04:00
parent 52b5db3a0b
commit 68c2b070da
5 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/user.go
View File

@@ -285,11 +285,6 @@ func CreateOAuthUser(c *Context, w http.ResponseWriter, r *http.Request, service
suchan := Srv.Store.User().GetByAuth(user.AuthData, service)
euchan := Srv.Store.User().GetByEmail(user.Email)
var tchan store.StoreChannel
if len(teamId) != 0 {
tchan = Srv.Store.Team().Get(teamId)
}
found := true
count := 0
for found {
@@ -319,20 +314,14 @@ func CreateOAuthUser(c *Context, w http.ResponseWriter, r *http.Request, service
return nil
}
if tchan != nil {
if result := <-tchan; result.Err != nil {
c.Err = result.Err
if len(teamId) > 0 {
err = JoinUserToTeamById(teamId, user)
if err != nil {
c.Err = err
return nil
} else {
team := result.Data.(*model.Team)
err = JoinUserToTeam(team, user)
if err != nil {
c.Err = err
return nil
}
go addDirectChannels(team.Id, user)
}
go addDirectChannels(teamId, user)
}
doLogin(c, w, r, ruser, "")