public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auth: saml enabled check. (#17960)

Browse Source
This commit is contained in:
Leonard Gram
2019-07-05 16:39:52 +02:00
committed by GitHub
parent e574147b1e
commit b67905a963
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/login.go
+1 -10
View File
@@ -38,7 +38,7 @@ func (hs *HTTPServer) LoginView(c *models.ReqContext) {
viewData.Settings["loginHint"] = setting.LoginHint
viewData.Settings["passwordHint"] = setting.PasswordHint
viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
viewData.Settings["samlEnabled"] = isSamlEnabled()
viewData.Settings["samlEnabled"] = hs.Cfg.SAMLEnabled
if loginError, ok := tryGetEncryptedCookie(c, LoginErrorCookieName); ok {
deleteCookie(c, LoginErrorCookieName)
@@ -63,15 +63,6 @@ func (hs *HTTPServer) LoginView(c *models.ReqContext) {
c.Redirect(setting.AppSubUrl + "/")
}
func isSamlEnabled() bool {
enabledCmd := models.IsSAMLEnabledCommand{}
if err := bus.Dispatch(&enabledCmd); err != nil {
return false
}
return enabledCmd.Result
}
func tryOAuthAutoLogin(c *models.ReqContext) bool {
if !setting.OAuthAutoLogin {
return false