diff options
author | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
commit | bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1 (patch) | |
tree | 1626d089802a92ee208b6e7fa056378e40568a92 /api/user.go | |
parent | 581785f5044eecdc7cf664e4c7fc59efc6babc96 (diff) | |
parent | 9bba6c79882d1f5d14b98052caf59a11fc2388d5 (diff) | |
download | chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.gz chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.bz2 chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.zip |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'api/user.go')
-rw-r--r-- | api/user.go | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/api/user.go b/api/user.go index 27afbd469..a6817caa2 100644 --- a/api/user.go +++ b/api/user.go @@ -444,6 +444,38 @@ func LoginByEmail(c *Context, w http.ResponseWriter, r *http.Request, email, nam return nil } +func LoginByUsername(c *Context, w http.ResponseWriter, r *http.Request, username, name, password, deviceId string) *model.User { + var team *model.Team + + if result := <-Srv.Store.Team().GetByName(name); result.Err != nil { + c.Err = result.Err + return nil + } else { + team = result.Data.(*model.Team) + } + + if result := <-Srv.Store.User().GetByUsername(team.Id, username); result.Err != nil { + c.Err = result.Err + c.Err.StatusCode = http.StatusForbidden + return nil + } else { + user := result.Data.(*model.User) + + if len(user.AuthData) != 0 { + c.Err = model.NewLocAppError("LoginByUsername", "api.user.login_by_email.sign_in.app_error", + map[string]interface{}{"AuthService": user.AuthService}, "") + return nil + } + + if checkUserLoginAttempts(c, user) && checkUserPassword(c, user, password) { + Login(c, w, r, user, deviceId) + return user + } + } + + return nil +} + func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service string, userData io.ReadCloser, team *model.Team) *model.User { authData := "" provider := einterfaces.GetOauthProvider(service) @@ -629,6 +661,8 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { user = LoginById(c, w, r, props["id"], props["password"], props["device_id"]) } else if len(props["email"]) != 0 && len(props["name"]) != 0 { user = LoginByEmail(c, w, r, props["email"], props["name"], props["password"], props["device_id"]) + } else if len(props["username"]) != 0 && len(props["name"]) != 0 { + user = LoginByUsername(c, w, r, props["username"], props["name"], props["password"], props["device_id"]) } else { c.Err = model.NewLocAppError("login", "api.user.login.not_provided.app_error", nil, "") c.Err.StatusCode = http.StatusForbidden |