Fix #3550: OCM share fails for json driver (#3551)

* Fix for #3550 Co-authored-by: Antoon P <antoon@redblom.com>
cs3org · Jan 10, 2023 · a23c0b6 · a23c0b6
1 parent 6873d40
commit a23c0b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/changelog/unreleased/fix-3550.md b/changelog/unreleased/fix-3550.md
@@ -0,0 +1,6 @@
+Bugfix: Fixes implementation omission of #3526
+
+In #3526 a new value format of the owner parameter of the ocm share request was introduced.
+This change was not implemented in the json driver. This change fixes that.
+
+https://github.com/cs3org/reva/pull/3551
diff --git a/pkg/ocm/share/manager/json/json.go b/pkg/ocm/share/manager/json/json.go
@@ -268,9 +268,9 @@ func (m *mgr) Share(ctx context.Context, md *provider.ResourceId, g *ocm.ShareGr
 			"shareWith":    g.Grantee.GetUserId().OpaqueId,
 			"name":         name,
 			"providerId":   fmt.Sprintf("%s:%s", md.StorageId, md.OpaqueId),
-			"owner":        userID.OpaqueId,
+			"owner":        fmt.Sprintf("%s@%s", userID.OpaqueId, userID.Idp),
 			"protocol":     protocol,
-			"meshProvider": userID.Idp, // FIXME: move this into the 'owner' string?
+			"meshProvider": userID.Idp,
 		}
 		err = sender.Send(ctx, requestBodyMap, pi)
 		if err != nil {