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

Final tweaks to auth proxy feature

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-05-02 12:30:53 +02:00
parent be589d81c7
commit 38fc85d619
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/sqlstore/user.go
View File

@@ -265,17 +265,17 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
LEFT OUTER JOIN org_user on org_user.org_id = u.org_id and org_user.user_id = u.id
LEFT OUTER JOIN org on org.id = u.org_id `
sess := x.Table("user")
if query.UserId > 0 {
rawSql += "WHERE u.id=?"
sess.Sql(rawSql+"WHERE u.id=?", query.UserId)
} else if query.Login != "" {
rawSql += "WHERE u.login=?"
sess.Sql(rawSql+"WHERE u.login=?", query.Login)
} else if query.Email != "" {
rawSql += "WHERE u.email=?"
sess.Sql(rawSql+"WHERE u.email=?", query.Email)
}
var user m.SignedInUser
sess := x.Table("user")
has, err := sess.Sql(rawSql, query.UserId).Get(&user)
has, err := sess.Get(&user)
if err != nil {
return err
} else if !has {