diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-16 18:22:50 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-16 18:22:50 -0400 |
commit | 08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c (patch) | |
tree | ad1bd1cf64ccf8dc6e771f96e0616df0362f1f08 /api/user.go | |
parent | 45eee993ea2e3aa230255253f71c08b223760a70 (diff) | |
parent | fb9a6c76113e5913d2ad7edb595a05e8567a3e85 (diff) | |
download | chat-08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c.tar.gz chat-08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c.tar.bz2 chat-08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c.zip |
Merge pull request #2419 from mattermost/plt-2044
PLT-2044 Auto-create account if team allows sign-up from login page and oauth …
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 2c8185209..aadf735d0 100644 --- a/api/user.go +++ b/api/user.go @@ -249,7 +249,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 { @@ -481,7 +481,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 { @@ -489,7 +492,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 { @@ -500,6 +503,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 { |