mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-02 08:49:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #898 from opencloud-eu/fix#368

Browse Source 
always get the user email for admin user
This commit is contained in:
Ralf Haferkamp
2025-05-21 17:58:27 +02:00
committed by GitHub
parent 73bee868d6 64abdad3d0
commit 11ad5a64fa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/graph/pkg/service/v0/users.go
+3 -2
View File
@@ -557,8 +557,9 @@ func (g Graph) GetUser(w http.ResponseWriter, r *http.Request) {
return
}
}
if !g.config.API.ShowUserEmailInResults {
ctxHasFullPerms := g.contextUserHasFullAccountPerms(r.Context())
if !ctxHasFullPerms && !g.config.API.ShowUserEmailInResults {
user.Mail = nil
}
services/graph/pkg/service/v0/users_test.go
+4
View File
@@ -581,6 +581,7 @@ var _ = Describe("Users", func() {
user := &libregraph.User{}
user.SetId("user1")
permissionService.On("GetPermissionByID", mock.Anything, mock.Anything).Return(&settings.GetPermissionByIDResponse{}, nil)
identityBackend.On("GetUser", mock.Anything, mock.Anything, mock.Anything).Return(user, nil)
valueService.On("GetValueByUniqueIdentifiers", mock.Anything, mock.Anything, mock.Anything).
Return(&settings.GetValueResponse{
@@ -621,6 +622,7 @@ var _ = Describe("Users", func() {
user := &libregraph.User{}
user.SetId("user1")
permissionService.On("GetPermissionByID", mock.Anything, mock.Anything).Return(&settings.GetPermissionByIDResponse{}, nil)
identityBackend.On("GetUser", mock.Anything, mock.Anything, mock.Anything).Return(user, nil)
gatewayClient.On("GetQuota", mock.Anything, mock.Anything, mock.Anything).Return(&provider.GetQuotaResponse{
Status: status.NewOK(ctx),
@@ -680,6 +682,7 @@ var _ = Describe("Users", func() {
user := &libregraph.User{}
user.SetId("user1")
permissionService.On("GetPermissionByID", mock.Anything, mock.Anything).Return(&settings.GetPermissionByIDResponse{}, nil)
identityBackend.On("GetUser", mock.Anything, mock.Anything, mock.Anything).Return(user, nil)
gatewayClient.On("GetQuota", mock.Anything, mock.Anything, mock.Anything).Return(&provider.GetQuotaResponse{
Status: status.NewOK(ctx),
@@ -732,6 +735,7 @@ var _ = Describe("Users", func() {
user := &libregraph.User{}
user.SetId("user1")
permissionService.On("GetPermissionByID", mock.Anything, mock.Anything).Return(&settings.GetPermissionByIDResponse{}, nil)
identityBackend.On("GetUser", mock.Anything, mock.Anything, mock.Anything).Return(user, nil)
assignments := []*settingsmsg.UserRoleAssignment{