From b74479e10a8b0b3b88ff57f7b05e1e2665bdd303 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Fri, 1 Dec 2023 13:52:54 +0100 Subject: [PATCH] test --- internal/http/services/owncloud/ocgraph/drives.go | 6 +++--- .../owncloud/ocs/handlers/apps/sharing/shares/shares.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/http/services/owncloud/ocgraph/drives.go b/internal/http/services/owncloud/ocgraph/drives.go index 2ef8bc9fd7..c72ee3f693 100644 --- a/internal/http/services/owncloud/ocgraph/drives.go +++ b/internal/http/services/owncloud/ocgraph/drives.go @@ -22,7 +22,7 @@ package ocgraph import ( "context" - "encoding/base32" + "encoding/base64" "encoding/json" "fmt" "net/http" @@ -149,8 +149,8 @@ func getDrivesForShares(ctx context.Context, gw gateway.GatewayAPIClient) ([]*li // TODO (gdelmont): filter out the rejected shares // the prefix of the remote_item.id and rootid - idPrefix := base32.StdEncoding.EncodeToString([]byte(fmt.Sprintf("#s%s", stat.Info.Path))) - resourceIdEnc := base32.StdEncoding.EncodeToString([]byte(resourceid.OwnCloudResourceIDWrap(stat.Info.Id))) + idPrefix := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s", stat.Info.Path))) + resourceIdEnc := base64.StdEncoding.EncodeToString([]byte(resourceid.OwnCloudResourceIDWrap(stat.Info.Id))) space := &libregraph.Drive{ Id: libregraph.PtrString(fmt.Sprintf("%s$%s!%s", shareJailID, shareJailID, share.Id.OpaqueId)), diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go index c0de4e3f35..6f2d811aef 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go @@ -21,7 +21,7 @@ package shares import ( "bytes" "context" - "encoding/base32" + "encoding/base64" "encoding/json" "fmt" "mime" @@ -1147,8 +1147,8 @@ func (h *Handler) addFileInfo(ctx context.Context, s *conversions.ShareData, inf s.MimeType = parsedMt // TODO STime: &types.Timestamp{Seconds: info.Mtime.Seconds, Nanos: info.Mtime.Nanos}, // TODO Storage: int - itemID := base32.StdEncoding.EncodeToString([]byte(fmt.Sprintf("#s%s", info.Path))) - itemID += "!" + base32.StdEncoding.EncodeToString([]byte(resourceid.OwnCloudResourceIDWrap(info.Id))) + itemID := base64.StdEncoding.EncodeToString([]byte(info.Path)) + itemID += "!" + base64.StdEncoding.EncodeToString([]byte(resourceid.OwnCloudResourceIDWrap(info.Id))) s.ItemSource = itemID s.FileSource = s.ItemSource