From 9b61096ad6016a7489d0fbaa3d10aa00e92dba6a Mon Sep 17 00:00:00 2001 From: kobergj Date: Tue, 12 Mar 2024 12:42:15 +0100 Subject: [PATCH] fix: static spaceid format for sse (#8625) --- changelog/unreleased/add-spaceid-to-sse.md | 1 + services/clientlog/pkg/service/service.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog/unreleased/add-spaceid-to-sse.md b/changelog/unreleased/add-spaceid-to-sse.md index fbeabb07ac..7ede42acb5 100644 --- a/changelog/unreleased/add-spaceid-to-sse.md +++ b/changelog/unreleased/add-spaceid-to-sse.md @@ -3,3 +3,4 @@ Adds the spaceID to all clientlog sse messages https://github.com/owncloud/ocis/pull/8614 + https://github.com/owncloud/ocis/pull/8624 diff --git a/services/clientlog/pkg/service/service.go b/services/clientlog/pkg/service/service.go index e481b4845b..e4143b770f 100644 --- a/services/clientlog/pkg/service/service.go +++ b/services/clientlog/pkg/service/service.go @@ -120,7 +120,7 @@ func (cl *ClientlogService) processEvent(event events.Event) { ItemID: storagespace.FormatResourceID(*e.ID), // TODO: check with web if parentID is needed // ParentItemID: storagespace.FormatResourceID(*item.GetRef().GetResourceId()), - SpaceID: e.ID.GetSpaceId(), + SpaceID: storagespace.FormatStorageID(e.ID.GetStorageId(), e.ID.GetSpaceId()), } users, err = utils.GetSpaceMembers(ctx, e.ID.GetSpaceId(), gwc, utils.ViewerRole) @@ -182,7 +182,7 @@ func processFileEvent(ctx context.Context, ref *provider.Reference, gwc gateway. data := FileEvent{ ParentItemID: storagespace.FormatResourceID(*info.GetParentId()), ItemID: storagespace.FormatResourceID(*info.GetId()), - SpaceID: info.GetSpace().GetId().GetOpaqueId(), + SpaceID: storagespace.FormatStorageID(info.GetSpace().GetRoot().GetStorageId(), info.GetSpace().GetRoot().GetSpaceId()), } users, err := utils.GetSpaceMembers(ctx, info.GetSpace().GetId().GetOpaqueId(), gwc, utils.ViewerRole)