IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): new design for alert tab with sidemenu

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-07-31 09:31:32 +02:00
parent 2b276d5cd1
commit 3b69c8f687
10 changed files with 192 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/login_oauth.go
View File

@@ -8,7 +8,6 @@ import (
"golang.org/x/oauth2"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
@@ -42,7 +41,7 @@ func OAuthLogin(ctx *middleware.Context) {
return
}
log.Trace("login.OAuthLogin(Got token)")
ctx.Logger.Debug("OAuthLogin Got token")
userInfo, err := connect.UserInfo(token)
if err != nil {
@@ -56,11 +55,11 @@ func OAuthLogin(ctx *middleware.Context) {
return
}
log.Trace("login.OAuthLogin(social login): %s", userInfo)
ctx.Logger.Debug("OAuthLogin got user info", "userInfo", userInfo)
// validate that the email is allowed to login to grafana
if !connect.IsEmailAllowed(userInfo.Email) {
log.Info("OAuth login attempt with unallowed email, %s", userInfo.Email)
ctx.Logger.Info("OAuth login attempt with unallowed email", "email", userInfo.Email)
ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required email domain not fulfilled"))
return
}