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

Include user Id on the lookup api (#8698)

Browse Source 
Implements feature request #8682
This commit is contained in:
Denis Doria 2017-06-25 14:23:03 +02:00 committed by Torkel Ödegaard
parent 60da730c95
commit 5aac2d2078
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/user.go
View File

@ -42,6 +42,7 @@ func GetUserByLoginOrEmail(c *middleware.Context) Response {
} }
user := query.Result user := query.Result
result := m.UserProfileDTO{ result := m.UserProfileDTO{
Id: user.Id,
Name: user.Name, Name: user.Name,
Email: user.Email, Email: user.Email,
Login: user.Login, Login: user.Login,

1
pkg/models/user.go
View File

@ -163,6 +163,7 @@ type SignedInUser struct {
} }
type UserProfileDTO struct { type UserProfileDTO struct {
Id int64 `json:"id"`
Email string `json:"email"` Email string `json:"email"`
Name string `json:"name"` Name string `json:"name"`
Login string `json:"login"` Login string `json:"login"`