Merge pull request #11254 from owncloud/fix/invited-by

fix: add missing invited-by share info
owncloud · Jul 23, 2024 · 0ba86b9 · 0ba86b9
2 parents 03e4f72 + d9213ac
commit 0ba86b9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/web-client/src/helpers/share/functions.ts b/packages/web-client/src/helpers/share/functions.ts
@@ -249,14 +249,15 @@ export function buildCollaboratorShare({
   indirect?: boolean
 }): CollaboratorShare {
   const role = graphRoles.find(({ id }) => id === graphPermission.roles?.[0])
+  const invitedBy = graphPermission.invitation?.invitedBy?.user
 
   return {
     id: graphPermission.id,
     resourceId,
     indirect,
     shareType: graphPermission.grantedToV2.group ? ShareTypes.group.value : ShareTypes.user.value,
     role,
-    sharedBy: { id: '', displayName: '' }, // FIXME: see https://github.com/owncloud/ocis/issues/9571
+    sharedBy: { id: invitedBy?.id, displayName: invitedBy?.displayName },
     sharedWith: graphPermission.grantedToV2.user || graphPermission.grantedToV2.group,
     permissions: (graphPermission['@libre.graph.permissions.actions']
       ? graphPermission['@libre.graph.permissions.actions']
@@ -275,12 +276,14 @@ export function buildLinkShare({
   resourceId: string
   indirect?: boolean
 }): LinkShare {
+  const invitedBy = graphPermission.invitation?.invitedBy?.user
+
   return {
     id: graphPermission.id,
     resourceId,
     indirect,
     shareType: ShareTypes.link.value,
-    sharedBy: { id: '', displayName: '' }, // FIXME: see https://github.com/owncloud/ocis/issues/9571
+    sharedBy: { id: invitedBy?.id, displayName: invitedBy?.displayName },
     hasPassword: graphPermission.hasPassword,
     createdDateTime: graphPermission.createdDateTime,
     expirationDateTime: graphPermission.expirationDateTime,