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

Add collaborator now handles role, added macaron-contrib/binding for binding and validation

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-16 11:54:19 +01:00
parent cd5843e977
commit f858f6b621
11 changed files with 81 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/login_oauth.go
View File

@@ -51,7 +51,7 @@ func OAuthLogin(ctx *middleware.Context) {
log.Info("login.OAuthLogin(social login): %s", userInfo)
userQuery := m.GetAccountByLoginQuery{Login: userInfo.Email}
userQuery := m.GetAccountByLoginQuery{LoginOrEmail: userInfo.Email}
err = bus.Dispatch(&userQuery)
// create account if missing