minor fix on API response

diff --git a/cmd/web.go b/cmd/web.go
index 386fae74f87d8c4d6a206d21d2a55e3b9d84e915..ae4403c0cacf47831a71bf55fcd8d24afec253ff 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -222,7 +222,8 @@ func runWeb(ctx *cli.Context) {
                                        m.Get("", v1.GetUserInfo)
 
                                        m.Group("/tokens", func() {
-                                               m.Combo("").Get(v1.ListAccessTokens).Post(bind(v1.CreateAccessTokenForm{}), v1.CreateAccessToken)
+                                               m.Combo("").Get(v1.ListAccessTokens).
+                                                       Post(bind(v1.CreateAccessTokenForm{}), v1.CreateAccessToken)
                                        }, middleware.ApiReqBasicAuth())
                                })
                        })

diff --git a/routers/api/v1/user.go b/routers/api/v1/user.go
index feecda483dff71687ae33b7fffa11ac12736b46b..60b6adcd120f470607cfc9c3236f160012ed183c 100644 (file)
--- a/routers/api/v1/user.go
+++ b/routers/api/v1/user.go
@@ -18,7 +18,7 @@ import (
 // ToApiUser converts user to API format.
 func ToApiUser(u *models.User) *api.User {
        return &api.User{
-               Id:        u.Id,
+               ID:        u.Id,
                UserName:  u.Name,
                AvatarUrl: string(setting.Protocol) + u.AvatarLink(),
        }
@@ -45,10 +45,14 @@ func SearchUsers(ctx *middleware.Context) {
        results := make([]*api.User, len(us))
        for i := range us {
                results[i] = &api.User{
+                       ID:        us[i].Id,
                        UserName:  us[i].Name,
                        AvatarUrl: us[i].AvatarLink(),
                        FullName:  us[i].FullName,
                }
+               if ctx.IsSigned {
+                       results[i].Email = us[i].Email
+               }
        }
 
        ctx.Render.JSON(200, map[string]interface{}{