diff --git a/.drone.star b/.drone.star
index 489444440..8d90438d4 100644
--- a/.drone.star
+++ b/.drone.star
@@ -17,7 +17,7 @@ OC_CI_PHP = "owncloudci/php:%s"
OC_CI_WAIT_FOR = "owncloudci/wait-for:latest"
OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:0.2.0"
OC_LITMUS = "owncloudci/litmus:latest"
-OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.8.3"
+OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.8.5"
OC_UBUNTU = "owncloud/ubuntu:20.04"
PLUGINS_CODACY = "plugins/codacy:1"
PLUGINS_DOCKER = "plugins/docker:latest"
@@ -152,7 +152,7 @@ config = {
"os": ["linux", "darwin"],
},
"dockerReleases": {
- "architectures": ["arm", "arm64", "amd64"],
+ "architectures": ["arm64", "amd64"],
},
"litmus": True,
"codestyle": True,
@@ -1144,7 +1144,8 @@ def e2eTests(ctx):
ocisServer("ocis", 4, []) + \
e2e_test_ocis + \
uploadTracingResult(ctx) + \
- publishTracingResult(ctx, "e2e test")
+ buildTracingComment() + \
+ e2eGithubComment()
if ("skip-e2e" in ctx.build.title.lower()):
return []
@@ -1177,7 +1178,7 @@ def uploadTracingResult(ctx):
"path_style": True,
"source": "webTestRunner/reports/e2e/playwright/tracing/**/*",
"strip_prefix": "webTestRunner/reports/e2e/playwright/tracing",
- "target": "${DRONE_BUILD_NUMBER}/tracing",
+ "target": "/${DRONE_REPO}/${DRONE_BUILD_NUMBER}/tracing",
},
"environment": {
"AWS_ACCESS_KEY_ID": {
@@ -1198,19 +1199,18 @@ def uploadTracingResult(ctx):
},
}]
-def publishTracingResult(ctx, suite):
+def buildTracingComment():
return [{
- "name": "publish-tracing-result",
+ "name": "build-tracing-comment",
"image": OC_UBUNTU,
"commands": [
"cd %s/reports/e2e/playwright/tracing/" % dirs["web"],
'echo ":boom: To see the trace, please open the link in the console ...
\\n\\n\\n\\n" >> comments.file',
- 'for f in *.zip; do echo "#### npx playwright show-trace $CACHE_ENDPOINT/$CACHE_BUCKET/${DRONE_BUILD_NUMBER}/tracing/$f \n" >> comments.file; done',
+ 'for f in *.zip; do echo "#### npx playwright show-trace $CACHE_ENDPOINT/$CACHE_BUCKET/${DRONE_REPO}/${DRONE_BUILD_NUMBER}/tracing/$f \n" >> comments.file; done',
'echo "\n
diff --git a/services/graph/images/mermaid-graph.svg b/services/graph/images/mermaid-graph.svg
new file mode 100644
index 000000000..6ff62a89f
--- /dev/null
+++ b/services/graph/images/mermaid-graph.svg
@@ -0,0 +1 @@
+
diff --git a/services/graph/pkg/service/v0/users_filter.go b/services/graph/pkg/service/v0/users_filter.go
index a836f5378..8448a5605 100644
--- a/services/graph/pkg/service/v0/users_filter.go
+++ b/services/graph/pkg/service/v0/users_filter.go
@@ -50,6 +50,12 @@ func (g Graph) applyFilterLogical(ctx context.Context, req *godata.GoDataRequest
return users, invalidFilterError()
}
return g.applyFilterLogicalAnd(ctx, req, root.Children[0], root.Children[1])
+ case "or":
+ // 'or' needs 2 operands
+ if len(root.Children) != 2 {
+ return users, invalidFilterError()
+ }
+ return g.applyFilterLogicalOr(ctx, req, root.Children[0], root.Children[1])
}
logger.Debug().Str("Token", root.Token.Value).Msg("unsupported logical filter")
return users, unsupportedFilterError()
@@ -109,6 +115,32 @@ func (g Graph) applyFilterLogicalAnd(ctx context.Context, req *godata.GoDataRequ
return filteredUsers, nil
}
+func (g Graph) applyFilterLogicalOr(ctx context.Context, req *godata.GoDataRequest, operand1 *godata.ParseNode, operand2 *godata.ParseNode) (users []*libregraph.User, err error) {
+ // logger := g.logger.SubloggerWithRequestID(ctx)
+ var res1, res2 []*libregraph.User
+
+ res1, err = g.applyUserFilter(ctx, req, operand1)
+ if err != nil {
+ return []*libregraph.User{}, err
+ }
+
+ res2, err = g.applyUserFilter(ctx, req, operand2)
+ if err != nil {
+ return []*libregraph.User{}, err
+ }
+
+ // We now have two slices with results of the subfilters. Now turn one of them
+ // into a map for efficiently getting the union of both slices
+ userSet := userSliceToMap(res1)
+ filteredUsers := make([]*libregraph.User, 0, len(res1)+len(res2))
+ filteredUsers = append(filteredUsers, res1...)
+ for _, user := range res2 {
+ if _, found := userSet[user.GetId()]; !found {
+ filteredUsers = append(filteredUsers, user)
+ }
+ }
+ return filteredUsers, nil
+}
func (g Graph) applyFilterLambda(ctx context.Context, req *godata.GoDataRequest, nodes []*godata.ParseNode) (users []*libregraph.User, err error) {
logger := g.logger.SubloggerWithRequestID(ctx)
if len(nodes) != 2 {
diff --git a/services/graph/pkg/service/v0/users_test.go b/services/graph/pkg/service/v0/users_test.go
index b020ef207..a6f342fa0 100644
--- a/services/graph/pkg/service/v0/users_test.go
+++ b/services/graph/pkg/service/v0/users_test.go
@@ -378,9 +378,12 @@ var _ = Describe("Users", func() {
Entry("with memberOf lambda filter with UUID", "memberOf/any(n:n/id eq 25cb7bc0-3168-4a0c-adbe-396f478ad494)", http.StatusOK),
Entry("with memberOf lambda filter with UUID string", "memberOf/any(n:n/id eq '25cb7bc0-3168-4a0c-adbe-396f478ad494')", http.StatusOK),
Entry("with appRoleAssignments lambda filter with appRoleId", "appRoleAssignments/any(n:n/appRoleId eq 'some-appRole-ID')", http.StatusOK),
- Entry("with two memberOf lambda filters",
+ Entry("with two memberOf lambda filters combined with and",
"memberOf/any(n:n/id eq 25cb7bc0-3168-4a0c-adbe-396f478ad494) and memberOf/any(n:n/id eq 2713f1d5-6822-42bd-ad56-9f6c55a3a8fa)",
http.StatusOK),
+ Entry("with two memberOf lambda filters combined with or",
+ "memberOf/any(n:n/id eq 25cb7bc0-3168-4a0c-adbe-396f478ad494) or memberOf/any(n:n/id eq 2713f1d5-6822-42bd-ad56-9f6c55a3a8fa)",
+ http.StatusOK),
Entry("with supported appRoleAssignments lambda filter property",
"appRoleAssignments/any(n:n/appRoleId eq 'some-appRoleAssignment-ID') and memberOf/any(n:n/id eq 2713f1d5-6822-42bd-ad56-9f6c55a3a8fa)",
http.StatusOK),
diff --git a/tests/acceptance/features/apiGraph/assignRole.feature b/tests/acceptance/features/apiGraph/assignRole.feature
index bcd76e790..a352818ae 100644
--- a/tests/acceptance/features/apiGraph/assignRole.feature
+++ b/tests/acceptance/features/apiGraph/assignRole.feature
@@ -31,3 +31,17 @@ Feature: assign role
| Space Admin | 401 |
| User | 401 |
| Guest | 401 |
+
+
+ Scenario Outline: assign role to the user with setting api and list role with graph api
+ Given user "Alice" has been created with default attributes and without skeleton files
+ And the administrator has given "Alice" the role "" using the settings api
+ When the administrator retrieves the assigned role of user "Alice" using the Graph API
+ Then the HTTP status code should be "200"
+ And the Graph API response should have the role ""
+ Examples:
+ | userRole |
+ | Admin |
+ | Space Admin |
+ | User |
+ | Guest |
diff --git a/tests/acceptance/features/bootstrap/GraphContext.php b/tests/acceptance/features/bootstrap/GraphContext.php
index 64e62163f..4117f7399 100644
--- a/tests/acceptance/features/bootstrap/GraphContext.php
+++ b/tests/acceptance/features/bootstrap/GraphContext.php
@@ -1727,20 +1727,7 @@ class GraphContext implements Context {
$userId = $this->featureContext->getAttributeOfCreatedUser($user, 'id') ?? $user;
if (empty($this->appEntity)) {
- $applicationEntity = (
- $this->featureContext->getJsonDecodedResponse(
- GraphHelper::getApplications(
- $this->featureContext->getBaseUrl(),
- $this->featureContext->getStepLineRef(),
- $this->featureContext->getAdminUsername(),
- $this->featureContext->getAdminPassword(),
- )
- )
- )['value'][0];
- $this->appEntity["id"] = $applicationEntity["id"];
- foreach ($applicationEntity["appRoles"] as $value) {
- $this->appEntity["appRoles"][$value['displayName']] = $value['id'];
- }
+ $this->setApplicationEntity();
}
$response = GraphHelper::assignRole(
@@ -1782,6 +1769,29 @@ class GraphContext implements Context {
);
}
+ /**
+ * set application Entity in global variable
+ *
+ * @return void
+ * @throws GuzzleException
+ */
+ public function setApplicationEntity(): void {
+ $applicationEntity = (
+ $this->featureContext->getJsonDecodedResponse(
+ GraphHelper::getApplications(
+ $this->featureContext->getBaseUrl(),
+ $this->featureContext->getStepLineRef(),
+ $this->featureContext->getAdminUsername(),
+ $this->featureContext->getAdminPassword(),
+ )
+ )
+ )['value'][0];
+ $this->appEntity["id"] = $applicationEntity["id"];
+ foreach ($applicationEntity["appRoles"] as $value) {
+ $this->appEntity["appRoles"][$value['displayName']] = $value['id'];
+ }
+ }
+
/**
* @Then /^the Graph API response should have the role "([^"]*)"$/
*
@@ -1789,9 +1799,13 @@ class GraphContext implements Context {
*
* @return void
* @throws Exception
+ * @throws GuzzleException
*/
public function theGraphApiResponseShouldHaveTheRole(string $role): void {
$response = $this->featureContext->getJsonDecodedResponse($this->featureContext->getResponse())['value'][0];
+ if (empty($this->appEntity)) {
+ $this->setApplicationEntity();
+ }
Assert::assertEquals(
$this->appEntity["appRoles"][$role],
$response['appRoleId'],