diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-09 15:56:50 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-09 15:56:50 -0400 |
| commit | ff72a126d3f6a45da8968ddc0a8e79721fe64e64 (patch) | |
| tree | 7d20a7e64d1c003f349b498e9e2d3e831a43076c /api/user.go | |
| parent | 3eebd15bf02fc767dfec816f2cd785068e8c5f80 (diff) | |
| download | chat-ff72a126d3f6a45da8968ddc0a8e79721fe64e64.tar.gz chat-ff72a126d3f6a45da8968ddc0a8e79721fe64e64.tar.bz2 chat-ff72a126d3f6a45da8968ddc0a8e79721fe64e64.zip | |
PLT-2862 Re-added LDAP login boxes as part of signup flow (#2937)
* Added ldap_only parameter for login API
* Re-added LDAP login boxes as part of signup flow
Diffstat (limited to 'api/user.go')
| -rw-r--r-- | api/user.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/api/user.go b/api/user.go index 60162d8f1..c53a643c7 100644 --- a/api/user.go +++ b/api/user.go @@ -436,6 +436,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { password := props["password"] mfaToken := props["token"] deviceId := props["device_id"] + ldapOnly := props["ldap_only"] == "true" if len(password) == 0 { c.Err = model.NewLocAppError("login", "api.user.login.blank_pwd.app_error", nil, "") @@ -460,7 +461,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { } else { c.LogAudit("attempt") - if user, err = getUserForLogin(loginId); err != nil { + if user, err = getUserForLogin(loginId, ldapOnly); err != nil { c.LogAudit("failure") c.Err = err return @@ -485,13 +486,13 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { w.Write([]byte(user.ToJson())) } -func getUserForLogin(loginId string) (*model.User, *model.AppError) { +func getUserForLogin(loginId string, onlyLdap bool) (*model.User, *model.AppError) { ldapAvailable := *utils.Cfg.LdapSettings.Enable && einterfaces.GetLdapInterface() != nil if result := <-Srv.Store.User().GetForLogin( loginId, - *utils.Cfg.EmailSettings.EnableSignInWithUsername, - *utils.Cfg.EmailSettings.EnableSignInWithEmail, + *utils.Cfg.EmailSettings.EnableSignInWithUsername && !onlyLdap, + *utils.Cfg.EmailSettings.EnableSignInWithEmail && !onlyLdap, ldapAvailable, ); result.Err != nil { |