diff options
| -rw-r--r-- | integrations/api_pull_review_test.go | 2 | ||||
| -rw-r--r-- | integrations/api_user_search_test.go | 11 | ||||
| -rw-r--r-- | modules/convert/convert.go | 25 | ||||
| -rw-r--r-- | modules/convert/user.go | 35 |
4 files changed, 47 insertions, 26 deletions
diff --git a/integrations/api_pull_review_test.go b/integrations/api_pull_review_test.go index 611b34712c..28eed87255 100644 --- a/integrations/api_pull_review_test.go +++ b/integrations/api_pull_review_test.go @@ -43,7 +43,7 @@ func TestAPIPullReview(t *testing.T) { assert.EqualValues(t, 10, reviews[5].ID) assert.EqualValues(t, "REQUEST_CHANGES", reviews[5].State) assert.EqualValues(t, 1, reviews[5].CodeCommentsCount) - assert.EqualValues(t, 0, reviews[5].Reviewer.ID) // ghost user + assert.EqualValues(t, -1, reviews[5].Reviewer.ID) // ghost user assert.EqualValues(t, false, reviews[5].Stale) assert.EqualValues(t, true, reviews[5].Official) diff --git a/integrations/api_user_search_test.go b/integrations/api_user_search_test.go index 6661862228..c5295fbba5 100644 --- a/integrations/api_user_search_test.go +++ b/integrations/api_user_search_test.go @@ -5,9 +5,12 @@ package integrations import ( + "fmt" "net/http" "testing" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" @@ -45,8 +48,14 @@ func TestAPIUserSearchNotLoggedIn(t *testing.T) { var results SearchResults DecodeJSON(t, resp, &results) assert.NotEmpty(t, results.Data) + var modelUser *models.User for _, user := range results.Data { assert.Contains(t, user.UserName, query) - assert.Empty(t, user.Email) + modelUser = models.AssertExistsAndLoadBean(t, &models.User{ID: user.ID}).(*models.User) + if modelUser.KeepEmailPrivate { + assert.EqualValues(t, fmt.Sprintf("%s@%s", modelUser.LowerName, setting.Service.NoReplyAddress), user.Email) + } else { + assert.EqualValues(t, modelUser.Email, user.Email) + } } } diff --git a/modules/convert/convert.go b/modules/convert/convert.go index 94ecdd1150..03a84115a5 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -1,4 +1,5 @@ // Copyright 2015 The Gogs Authors. All rights reserved. +// Copyright 2018 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. @@ -11,7 +12,6 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" @@ -331,29 +331,6 @@ func ToTeam(team *models.Team) *api.Team { } } -// ToUser convert models.User to api.User -// signed shall only be set if requester is logged in. authed shall only be set if user is site admin or user himself -func ToUser(user *models.User, signed, authed bool) *api.User { - result := &api.User{ - UserName: user.Name, - AvatarURL: user.AvatarLink(), - FullName: markup.Sanitize(user.FullName), - Created: user.CreatedUnix.AsTime(), - } - // hide primary email if API caller is anonymous or user keep email private - if signed && (!user.KeepEmailPrivate || authed) { - result.Email = user.Email - } - // only site admin will get these information and possibly user himself - if authed { - result.ID = user.ID - result.IsAdmin = user.IsAdmin - result.LastLogin = user.LastLoginUnix.AsTime() - result.Language = user.Language - } - return result -} - // ToAnnotatedTag convert git.Tag to api.AnnotatedTag func ToAnnotatedTag(repo *models.Repository, t *git.Tag, c *git.Commit) *api.AnnotatedTag { return &api.AnnotatedTag{ diff --git a/modules/convert/user.go b/modules/convert/user.go new file mode 100644 index 0000000000..c75a8aac52 --- /dev/null +++ b/modules/convert/user.go @@ -0,0 +1,35 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package convert + +import ( + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/markup" + api "code.gitea.io/gitea/modules/structs" +) + +// ToUser convert models.User to api.User +// signed shall only be set if requester is logged in. authed shall only be set if user is site admin or user himself +func ToUser(user *models.User, signed, authed bool) *api.User { + result := &api.User{ + ID: user.ID, + UserName: user.Name, + FullName: markup.Sanitize(user.FullName), + Email: user.GetEmail(), + AvatarURL: user.AvatarLink(), + Created: user.CreatedUnix.AsTime(), + } + // hide primary email if API caller is anonymous or user keep email private + if signed && (!user.KeepEmailPrivate || authed) { + result.Email = user.Email + } + // only site admin will get these information and possibly user himself + if authed { + result.IsAdmin = user.IsAdmin + result.LastLogin = user.LastLoginUnix.AsTime() + result.Language = user.Language + } + return result +} |