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

graph/sharedWithMe: Fix 'createdBy' attribute for resources from project spaces

Browse Source 
Don't return a meaningless userid anymore for shares created from files or directories
in a project space. These resources don't have a real owner.

Fixes: #8314
This commit is contained in:
Ralf Haferkamp
2024-01-30 17:31:21 +01:00
committed by Ralf Haferkamp
parent a44cf4a6ea
commit 36eff3b280
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ func (g Graph) cs3ReceivedSharesToDriveItems(ctx context.Context, receivedShares
remoteItem.SetSize(s)
}
if userID := shareStat.GetInfo().GetOwner(); userID != nil {
if userID := shareStat.GetInfo().GetOwner(); userID != nil && userID.Type != cs3User.UserType_USER_TYPE_SPACE_OWNER {
identity, err := g.cs3UserIdToIdentity(ctx, userID)
if err != nil {
// TODO: define a proper error behavior here. We don't

3
services/graph/pkg/service/v0/sharedwithme_test.go
View File

@@ -387,8 +387,7 @@ var _ = Describe("SharedWithMe", func() {
jsonData := gjson.Get(tape.Body.String(), "value.0.createdBy")
Expect(jsonData.Get("user.displayName").String()).To(Equal(""))
Expect(jsonData.Get("user.id").String()).To(Equal(ownerID.OpaqueId))
Expect(jsonData.String()).To(Equal(""))
jsonData = gjson.Get(tape.Body.String(), "value.0.remoteItem.permissions.0.invitation.invitedBy.user")
Expect(jsonData.Get("displayName").String()).To(Equal(getUserResponseShareCreator.User.DisplayName))