From fb1b2f68966ee8820999230182619398443f2b81 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 16 Nov 2021 14:03:43 +0000 Subject: [PATCH 1/2] Fix ocm tutorial, fix #2284 --- examples/ocmd/ocmd-server-1.toml | 2 ++ examples/ocmd/ocmd-server-2.toml | 2 ++ examples/ocmd/users.demo.json | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/ocmd/ocmd-server-1.toml b/examples/ocmd/ocmd-server-1.toml index dad77ce087..4902f18fbe 100644 --- a/examples/ocmd/ocmd-server-1.toml +++ b/examples/ocmd/ocmd-server-1.toml @@ -116,6 +116,8 @@ driver = "json" users = "users.demo.json" [http] +enabled_services = ["ocmd"] +enabled_middlewares = ["providerauthorizer", "cors"] address = "0.0.0.0:19001" [http.services.dataprovider] diff --git a/examples/ocmd/ocmd-server-2.toml b/examples/ocmd/ocmd-server-2.toml index 9a945c64e4..61b1cc54f0 100644 --- a/examples/ocmd/ocmd-server-2.toml +++ b/examples/ocmd/ocmd-server-2.toml @@ -87,6 +87,8 @@ driver = "json" users = "users.demo.json" [http] +enabled_services = ["ocmd"] +enabled_middlewares = ["providerauthorizer", "cors"] address = "0.0.0.0:17001" [http.services.dataprovider] diff --git a/examples/ocmd/users.demo.json b/examples/ocmd/users.demo.json index 0f96aeece1..e1b52cb806 100644 --- a/examples/ocmd/users.demo.json +++ b/examples/ocmd/users.demo.json @@ -2,7 +2,7 @@ { "id": { "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51", - "idp": "https://cernbox.cern.ch", + "idp": "cernbox.cern.ch", "type": 1 }, "username": "einstein", @@ -28,7 +28,7 @@ { "id": { "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", - "idp": "https://cesnet.cz", + "idp": "cesnet.cz", "type": 1 }, "username": "marie", @@ -54,7 +54,7 @@ { "id": { "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c", - "idp": "https://example.org", + "idp": "example.org", "type": 1 }, "username": "richard", @@ -80,7 +80,7 @@ { "id": { "opaque_id": "932b4522-139b-4815-8ef4-42cdf82c3d51", - "idp": "https://example.com", + "idp": "example.com", "type": 1 }, "username": "test", From b4cbd0f1dfa79d82ff0ff8e5b6f72a6da5a73a42 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Tue, 16 Nov 2021 15:10:52 +0100 Subject: [PATCH 2/2] Add changelog entry --- changelog/unreleased/fix-ocmd-tutorial.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/fix-ocmd-tutorial.md diff --git a/changelog/unreleased/fix-ocmd-tutorial.md b/changelog/unreleased/fix-ocmd-tutorial.md new file mode 100644 index 0000000000..7bcca66d8e --- /dev/null +++ b/changelog/unreleased/fix-ocmd-tutorial.md @@ -0,0 +1,5 @@ +Bugfix: Fix the ocmd tutorial + +Files: examples/ocmd +Instructions: https://reva.link/docs/tutorials/share-tutorial/#5-1-4-create-the-share +Issue: https://github.com/cs3org/reva/issues/2284