From 9701531c17d3fc7aa9449498cf13e7eef381f3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= <andre.duffeck@firondu.de>
Date: Mon, 20 Nov 2023 07:45:45 +0100
Subject: [PATCH] Change format of ocm share file ids to
 <ocmstorageproviderid>$<shareid>!<opaqueid>

---
 pkg/ocm/storage/received/ocm.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/ocm/storage/received/ocm.go b/pkg/ocm/storage/received/ocm.go
index 21abed3674c..73be2129d10 100644
--- a/pkg/ocm/storage/received/ocm.go
+++ b/pkg/ocm/storage/received/ocm.go
@@ -21,6 +21,7 @@ package ocm
 import (
 	"context"
 	"encoding/xml"
+	"fmt"
 	"io"
 	"io/fs"
 	"net/http"
@@ -212,15 +213,22 @@ func convertStatToResourceInfo(ref *provider.Reference, f fs.FileInfo, share *oc
 		name = f.Name()
 	}
 
-	id, err := storagespace.ParseID(props.GetString(xml.Name{Space: "http://owncloud.org/ns", Local: "fileid"}))
+	remoteId, err := storagespace.ParseID(props.GetString(xml.Name{Space: "http://owncloud.org/ns", Local: "fileid"}))
 	if err != nil {
 		return nil, err
 	}
+
+	// ids are of the format <ocmstorageproviderid>$<shareid>!<opaqueid>
+	id := &provider.ResourceId{
+		StorageId: utils.OCMStorageProviderID,
+		SpaceId:   share.Id.OpaqueId,
+		OpaqueId:  fmt.Sprintf("%s:%s:%s", remoteId.StorageId, remoteId.SpaceId, remoteId.OpaqueId),
+	}
 	webdavProtocol, _ := getWebDAVProtocol(share.Protocols)
 
 	return &provider.ResourceInfo{
 		Type:     t,
-		Id:       &id,
+		Id:       id,
 		MimeType: mime.Detect(f.IsDir(), f.Name()),
 		Path:     name,
 		Name:     name,