mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-12 00:34:20 -04:00
Fix #3391
This commit is contained in:
parent
96f92e6105
commit
2cb04db526
@ -195,6 +195,7 @@ func RegisterRoutes(m *macaron.Macaron) {
|
|||||||
}, reqToken())
|
}, reqToken())
|
||||||
|
|
||||||
m.Group("/user", func() {
|
m.Group("/user", func() {
|
||||||
|
m.Get("", user.GetAuthenticatedUser)
|
||||||
m.Combo("/emails").Get(user.ListEmails).
|
m.Combo("/emails").Get(user.ListEmails).
|
||||||
Post(bind(api.CreateEmailOption{}), user.AddEmail).
|
Post(bind(api.CreateEmailOption{}), user.AddEmail).
|
||||||
Delete(bind(api.CreateEmailOption{}), user.DeleteEmail)
|
Delete(bind(api.CreateEmailOption{}), user.DeleteEmail)
|
||||||
|
@ -11,9 +11,9 @@ import (
|
|||||||
|
|
||||||
"github.com/gogits/gogs/models"
|
"github.com/gogits/gogs/models"
|
||||||
"github.com/gogits/gogs/modules/context"
|
"github.com/gogits/gogs/modules/context"
|
||||||
|
"github.com/gogits/gogs/routers/api/v1/convert"
|
||||||
)
|
)
|
||||||
|
|
||||||
// https://github.com/gogits/go-gogs-client/wiki/Users#search-users
|
|
||||||
func Search(ctx *context.APIContext) {
|
func Search(ctx *context.APIContext) {
|
||||||
opts := &models.SearchUserOptions{
|
opts := &models.SearchUserOptions{
|
||||||
Keyword: ctx.Query("q"),
|
Keyword: ctx.Query("q"),
|
||||||
@ -52,7 +52,6 @@ func Search(ctx *context.APIContext) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://github.com/gogits/go-gogs-client/wiki/Users#get-a-single-user
|
|
||||||
func GetInfo(ctx *context.APIContext) {
|
func GetInfo(ctx *context.APIContext) {
|
||||||
u, err := models.GetUserByName(ctx.Params(":username"))
|
u, err := models.GetUserByName(ctx.Params(":username"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -68,5 +67,9 @@ func GetInfo(ctx *context.APIContext) {
|
|||||||
if !ctx.IsSigned {
|
if !ctx.IsSigned {
|
||||||
u.Email = ""
|
u.Email = ""
|
||||||
}
|
}
|
||||||
ctx.JSON(200, &api.User{u.ID, u.Name, u.FullName, u.Email, u.AvatarLink()})
|
ctx.JSON(200, convert.ToUser(u))
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetAuthenticatedUser(ctx *context.APIContext) {
|
||||||
|
ctx.JSON(200, convert.ToUser(ctx.User))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user