address review comments

cs3org · Jun 17, 2021 · ea4cf92 · ea4cf92
1 parent 07a4d39
commit ea4cf92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
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
@@ -618,7 +618,7 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 		var info *provider.ResourceInfo
 		if pinfo != nil {
 			// check if the shared resource matches the path resource
-			if !utils.ResourceEqual(&provider.Reference{ResourceId: rs.Share.ResourceId}, &provider.Reference{ResourceId: pinfo.Id}) {
+			if !utils.ResourceIDEqual(rs.Share.ResourceId, pinfo.Id) {
 				// try next share
 				continue
 			}

diff --git a/pkg/storage/fs/owncloud/owncloud.go b/pkg/storage/fs/owncloud/owncloud.go
@@ -801,8 +801,7 @@ func (fs *ocfs) resolve(ctx context.Context, ref *provider.Reference) (string, e
 		if err != nil {
 			return "", err
 		}
-		filepath.Join("/", ip, filepath.Join("/", ref.Path))
-		return ip, nil
+		return filepath.Join("/", ip, filepath.Join("/", ref.Path)), nil
 	}
 
 	// use a path

diff --git a/pkg/storage/fs/s3/s3.go b/pkg/storage/fs/s3/s3.go
@@ -119,7 +119,7 @@ func (fs *s3FS) resolve(ctx context.Context, ref *provider.Reference) (string, e
 		return fs.addRoot(ref.GetPath()), nil
 	}
 
-	if ref.ResourceId.OpaqueId != "" {
+	if ref.ResourceId != nil {
 		fn := path.Join("/", strings.TrimPrefix(ref.ResourceId.OpaqueId, "fileid-"))
 		fn = fs.addRoot(fn)
 		return fn, nil