Login: only enabled oauth options are shown on login page

aa261bbe · Torkel Ödegaard · a5e450a0 · 017eab8d · aa261bbe
Commit aa261bbe authored Jan 28, 2015 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

grafana
+1 -1

pkg/api/login.go
+4 -0

No files found.
--- a/grafana @ 017eab8d
+++ b/grafana @ 017eab8d
-Subproject commit 4572747bd60c688f7cc2cbf8a2303b9c95ad7b9d
+Subproject commit 017eab8dcd182b8c19f65657fc3d46e30545b7ff
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -22,6 +22,10 @@ func LoginView(c *middleware.Context) {
 		return
 	}

+	settings := c.Data["Settings"].(map[string]interface{})
+	settings["googleAuthEnabled"] = setting.OAuthService.Google
+	settings["githubAuthEnabled"] = setting.OAuthService.GitHub
+
 	// Check auto-login.
 	uname := c.GetCookie(setting.CookieUserName)
 	if len(uname) == 0 {