diff options
author | JoramWilander <jwawilander@gmail.com> | 2016-03-11 10:48:43 -0500 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2016-03-11 10:48:43 -0500 |
commit | fb9a6c76113e5913d2ad7edb595a05e8567a3e85 (patch) | |
tree | dab8e91d1c294e70054a1fadbb0cdef3e393bb80 /api/user.go | |
parent | f7156fdb3a4b5d5c35a5d394047e349f04dd2a10 (diff) | |
download | chat-fb9a6c76113e5913d2ad7edb595a05e8567a3e85.tar.gz chat-fb9a6c76113e5913d2ad7edb595a05e8567a3e85.tar.bz2 chat-fb9a6c76113e5913d2ad7edb595a05e8567a3e85.zip |
Auto-create account if team allows sign-up from login page and oauth account doesn't exist
Diffstat (limited to 'api/user.go')
-rw-r--r-- | api/user.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/api/user.go b/api/user.go index b7e6220d8..353fdff3e 100644 --- a/api/user.go +++ b/api/user.go @@ -246,7 +246,7 @@ func CreateUser(team *model.Team, user *model.User) (*model.User, *model.AppErro } } -func CreateOAuthUser(c *Context, w http.ResponseWriter, r *http.Request, service string, userData io.ReadCloser, team *model.Team) *model.User { +func CreateOAuthUser(c *Context, w http.ResponseWriter, r *http.Request, service string, userData io.Reader, team *model.Team) *model.User { var user *model.User provider := einterfaces.GetOauthProvider(service) if provider == nil { @@ -478,7 +478,10 @@ func LoginByUsername(c *Context, w http.ResponseWriter, r *http.Request, usernam return nil } -func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service string, userData io.ReadCloser, team *model.Team) *model.User { +func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service string, userData io.Reader, team *model.Team) *model.User { + buf := bytes.Buffer{} + buf.ReadFrom(userData) + authData := "" provider := einterfaces.GetOauthProvider(service) if provider == nil { @@ -486,7 +489,7 @@ func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service st map[string]interface{}{"Service": service}, "") return nil } else { - authData = provider.GetAuthDataFromJson(userData) + authData = provider.GetAuthDataFromJson(bytes.NewReader(buf.Bytes())) } if len(authData) == 0 { @@ -497,6 +500,9 @@ func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service st var user *model.User if result := <-Srv.Store.User().GetByAuth(team.Id, authData, service); result.Err != nil { + if result.Err.Id == store.MISSING_AUTH_ACCOUNT_ERROR && team.AllowOpenInvite { + return CreateOAuthUser(c, w, r, service, bytes.NewReader(buf.Bytes()), team) + } c.Err = result.Err return nil } else { |