change root item ID to match the format

This commit is contained in:
Michael Barz
2022-02-16 21:43:23 +01:00
parent 405e3a7693
commit 8fd70fd350
+2 -6
View File
@@ -411,10 +411,6 @@ func (g Graph) ListStorageSpacesWithFilters(ctx context.Context, filters []*stor
func (g Graph) cs3StorageSpaceToDrive(baseURL *url.URL, space *storageprovider.StorageSpace) (*libregraph.Drive, error) { func (g Graph) cs3StorageSpaceToDrive(baseURL *url.URL, space *storageprovider.StorageSpace) (*libregraph.Drive, error) {
rootID := resourceid.OwnCloudResourceIDWrap(space.Root) rootID := resourceid.OwnCloudResourceIDWrap(space.Root)
if space.Root.StorageId == space.Root.OpaqueId {
// omit opaqueid
rootID = space.Root.StorageId
}
var permissions []libregraph.Permission var permissions []libregraph.Permission
if space.Opaque != nil { if space.Opaque != nil {
@@ -473,7 +469,7 @@ func (g Graph) cs3StorageSpaceToDrive(baseURL *url.URL, space *storageprovider.S
} }
drive := &libregraph.Drive{ drive := &libregraph.Drive{
Id: &rootID, Id: &space.Root.StorageId,
Name: &space.Name, Name: &space.Name,
//"createdDateTime": "string (timestamp)", // TODO read from StorageSpace ... needs Opaque for now //"createdDateTime": "string (timestamp)", // TODO read from StorageSpace ... needs Opaque for now
//"description": "string", // TODO read from StorageSpace ... needs Opaque for now //"description": "string", // TODO read from StorageSpace ... needs Opaque for now
@@ -502,7 +498,7 @@ func (g Graph) cs3StorageSpaceToDrive(baseURL *url.URL, space *storageprovider.S
// TODO read from StorageSpace ... needs Opaque for now // TODO read from StorageSpace ... needs Opaque for now
// TODO how do we build the url? // TODO how do we build the url?
// for now: read from request // for now: read from request
webDavURL := baseURL.String() + rootID webDavURL := baseURL.String() + space.Root.StorageId
drive.Root.WebDavUrl = &webDavURL drive.Root.WebDavUrl = &webDavURL
} }