From 6cb783e71aa3e32acaaa39e1b2459dac2ee9fea5 Mon Sep 17 00:00:00 2001
From: Antoon P <antoon@redblom.com>
Date: Mon, 12 Dec 2022 14:46:53 +0100
Subject: [PATCH 1/3] Fix for #3550

---
 changelog/unreleased/fix-3550.md   | 5 +++++
 pkg/ocm/share/manager/json/json.go | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelog/unreleased/fix-3550.md

diff --git a/changelog/unreleased/fix-3550.md b/changelog/unreleased/fix-3550.md
new file mode 100644
index 0000000000..91af6ff244
--- /dev/null
+++ b/changelog/unreleased/fix-3550.md
@@ -0,0 +1,5 @@
+Fix: 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.
+
diff --git a/pkg/ocm/share/manager/json/json.go b/pkg/ocm/share/manager/json/json.go
index 624b148095..4327a434ae 100644
--- 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 {

From 74e92423b146c10b7b468f77d20ee2960c071954 Mon Sep 17 00:00:00 2001
From: Antoon P <antoon@redblom.com>
Date: Mon, 12 Dec 2022 14:56:04 +0100
Subject: [PATCH 2/3] Add PR to changelog

---
 changelog/unreleased/fix-3550.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog/unreleased/fix-3550.md b/changelog/unreleased/fix-3550.md
index 91af6ff244..739a9c787f 100644
--- a/changelog/unreleased/fix-3550.md
+++ b/changelog/unreleased/fix-3550.md
@@ -3,3 +3,4 @@ Fix: 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
\ No newline at end of file

From 968f3b5feac818fe4cfd9ee1a5b3e3084362dae7 Mon Sep 17 00:00:00 2001
From: Antoon P <antoon@redblom.com>
Date: Mon, 12 Dec 2022 14:57:37 +0100
Subject: [PATCH 3/3] Correct changelog

---
 changelog/unreleased/fix-3550.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/unreleased/fix-3550.md b/changelog/unreleased/fix-3550.md
index 739a9c787f..4f7165cf77 100644
--- a/changelog/unreleased/fix-3550.md
+++ b/changelog/unreleased/fix-3550.md
@@ -1,4 +1,4 @@
-Fix: Fixes implementation omission of #3526
+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.