From 152b337299730790ba89ce91c2aa43a82786e945 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Tue, 15 Feb 2022 16:23:12 +0100 Subject: [PATCH 1/2] update reva --- changelog/unreleased/update-reva.md | 1 + go.mod | 2 +- go.sum | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog/unreleased/update-reva.md b/changelog/unreleased/update-reva.md index ae4d29e4120..3c93a20765c 100644 --- a/changelog/unreleased/update-reva.md +++ b/changelog/unreleased/update-reva.md @@ -10,3 +10,4 @@ https://github.com/owncloud/ocis/pull/2901 https://github.com/owncloud/ocis/pull/2997 https://github.com/owncloud/ocis/pull/3116 https://github.com/owncloud/ocis/pull/3130 +https://github.com/owncloud/ocis/pull/3175 diff --git a/go.mod b/go.mod index 209ff478371..a68352d4a9b 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/blevesearch/bleve/v2 v2.3.0 github.com/coreos/go-oidc/v3 v3.1.0 github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 - github.com/cs3org/reva v1.16.1-0.20220214105747-d217886c962b + github.com/cs3org/reva v1.16.1-0.20220215130802-df1264deff58 github.com/disintegration/imaging v1.6.2 github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733 github.com/go-chi/chi/v5 v5.0.7 diff --git a/go.sum b/go.sum index 971382e6e6d..9227da0676c 100644 --- a/go.sum +++ b/go.sum @@ -339,6 +339,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 h1:1jqPH58jCxvba github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v1.16.1-0.20220214105747-d217886c962b h1:E53EHbKiHIIJeZgDEx5tE3AflxgL1dHughNbBQU7Dfk= github.com/cs3org/reva v1.16.1-0.20220214105747-d217886c962b/go.mod h1:gdKuhou74V47snANuHNIhGNJfCKUSCHPPvuhSx7nu5M= +github.com/cs3org/reva v1.16.1-0.20220215130802-df1264deff58 h1:CBSpClYZp8Q7Cl/xENW42Zy7M9+vqACAulqXFnWn3Ug= +github.com/cs3org/reva v1.16.1-0.20220215130802-df1264deff58/go.mod h1:gdKuhou74V47snANuHNIhGNJfCKUSCHPPvuhSx7nu5M= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= From 8386d243ff8807711144a823d362d37aec94861c Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 16 Feb 2022 09:51:59 +0545 Subject: [PATCH 2/2] Adjust test for changed spaces list JSON --- .../features/apiSpaces/shareSpaces.feature | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/acceptance/features/apiSpaces/shareSpaces.feature b/tests/acceptance/features/apiSpaces/shareSpaces.feature index 70704abdd37..bc83aaa5183 100644 --- a/tests/acceptance/features/apiSpaces/shareSpaces.feature +++ b/tests/acceptance/features/apiSpaces/shareSpaces.feature @@ -34,21 +34,22 @@ Feature: Share spaces And user "Alice" has shared a space "Share space to Brian" to user "Brian" with role "viewer" When user "Brian" lists all available spaces via the GraphApi Then the json responded should contain a space "Share space to Brian" owned by "Alice" with these key and value pairs: - | key | value | - | driveType | project | - | id | %space_id% | - | name | Share space to Brian | - | owner@@@user@@@id | %user_id% | + | key | value | + | driveType | project | + | id | %space_id% | + | name | Share space to Brian | + | root@@@permissions@@@0@@@grantedTo@@@0@@@user@@@id | %user_id% | + | root@@@permissions@@@0@@@roles@@@0 | manager | + - Scenario: A user can see who has been granted access Given user "Alice" has created a space "Share space to Brian" of type "project" with quota "10" And user "Alice" has shared a space "Share space to Brian" to user "Brian" with role "viewer" When user "Alice" lists all available spaces via the GraphApi Then the json responded should contain a space "Share space to Brian" granted to "Brian" with these key and value pairs: - | key | value | - | root@@@permissions@@@1@@@grantedTo@@@0@@@user@@@id | %user_id% | - | root@@@permissions@@@1@@@roles@@@0 | viewer | + | key | value | + | root@@@permissions@@@1@@@grantedTo@@@0@@@user@@@id | %user_id% | + | root@@@permissions@@@1@@@roles@@@0 | viewer | Scenario: A user can see a file in a received shared space