mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-04 19:29:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

graph/users: Return 'userType' for request from unprivileged users

Browse Source
This commit is contained in:
Ralf Haferkamp
2023-12-06 11:22:50 +01:00
committed by Ralf Haferkamp
parent d0289694e4
commit 20870380b1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/graph/pkg/service/v0/users.go
View File

@@ -266,7 +266,12 @@ func (g Graph) GetUsers(w http.ResponseWriter, r *http.Request) {
if !ctxHasFullPerms {
finalUsers := make([]*libregraph.User, len(users))
for i, u := range users {
finalUsers[i] = &libregraph.User{Id: u.Id, DisplayName: u.DisplayName, Mail: u.Mail}
finalUsers[i] = &libregraph.User{
Id: u.Id,
DisplayName: u.DisplayName,
Mail: u.Mail,
UserType: u.UserType,
}
}
users = finalUsers
}

2
services/graph/pkg/service/v0/users_test.go
View File

@@ -305,7 +305,7 @@ var _ = Describe("Users", func() {
userMap, err := res.Value[0].ToMap()
Expect(err).ToNot(HaveOccurred())
for k, _ := range userMap {
Expect(k).Should(BeElementOf([]string{"mail", "displayName", "id"}))
Expect(k).Should(BeElementOf([]string{"mail", "displayName", "id", "userType"}))
}
})