add remote item metadata

Signed-off-by: Michael Barz <[email protected]>
owncloud · Jun 13, 2023 · e4e1bb4 · e4e1bb4
1 parent 85dcb57
commit e4e1bb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/changelog/unreleased/add-remote-item-metadata.md b/changelog/unreleased/add-remote-item-metadata.md
@@ -0,0 +1,5 @@
+Enhancement: Add more metadata to the remote item
+
+We added the drive alias, the space name and the relative path to the remote item. This is needed to resolve shared files directly on the source space.
+
+https://github.com/owncloud/ocis/pull/6300
diff --git a/services/graph/pkg/service/v0/driveitems.go b/services/graph/pkg/service/v0/driveitems.go
@@ -129,7 +129,7 @@ func (g Graph) getRemoteItem(ctx context.Context, root *storageprovider.Resource
 		// TODO how do we build the url?
 		// for now: read from request
 		webDavURL := *baseURL
-		webDavURL.Path = path.Join(webDavURL.Path, storagespace.FormatResourceID(*root))
+		webDavURL.Path = path.Join(webDavURL.Path, storagespace.FormatResourceID(*res.GetInfo().GetSpace().GetRoot()), res.GetInfo().GetPath())
 		item.WebDavUrl = libregraph.PtrString(webDavURL.String())
 	}
 	return item, nil
@@ -192,8 +192,8 @@ func cs3ResourceToRemoteItem(res *storageprovider.ResourceInfo) (*libregraph.Rem
 		Size: size,
 	}
 
-	if name := path.Base(res.Path); name != "" {
-		remoteItem.Name = &name
+	if res.GetPath() != "" {
+		remoteItem.Path = libregraph.PtrString(path.Clean(res.GetPath()))
 	}
 	if res.Etag != "" {
 		remoteItem.ETag = &res.Etag
@@ -211,6 +211,14 @@ func cs3ResourceToRemoteItem(res *storageprovider.ResourceInfo) (*libregraph.Rem
 	if res.Type == storageprovider.ResourceType_RESOURCE_TYPE_CONTAINER {
 		remoteItem.Folder = &libregraph.Folder{}
 	}
+	if res.GetSpace() != nil {
+		remoteItem.RootId = libregraph.PtrString(storagespace.FormatResourceID(*res.GetSpace().GetRoot()))
+		grantSpaceAlias := utils.ReadPlainFromOpaque(res.GetSpace().GetOpaque(), "spaceAlias")
+		if grantSpaceAlias != "" {
+			remoteItem.DriveAlias = libregraph.PtrString(grantSpaceAlias)
+		}
+		remoteItem.Name = libregraph.PtrString(res.GetSpace().GetName())
+	}
 	return remoteItem, nil
 }