From 41dfd84543f94b2f273118dea44dcb346861ff0f Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Mon, 18 Jul 2022 20:55:59 +1200 Subject: [PATCH 1/4] Ensure user creating team with custom roles is always owner as well --- app/controllers/api/teams.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 383bcac149..40388a8520 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -67,6 +67,10 @@ App::post('/v1/teams') ]))); if (!$isPrivilegedUser && !$isAppUser) { // Don't add user on server mode + if (!\in_array('owner', $roles)) { + $roles[] = 'owner'; + } + $membershipId = $dbForProject->getId(); $membership = new Document([ '$id' => $membershipId, From 2b8e992646bafa74c48b057350330344dcfc9bb3 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Mon, 18 Jul 2022 21:26:58 +1200 Subject: [PATCH 2/4] Add roles to create team test --- tests/e2e/Services/Teams/TeamsBase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/e2e/Services/Teams/TeamsBase.php b/tests/e2e/Services/Teams/TeamsBase.php index e626124058..6f3dd167e9 100644 --- a/tests/e2e/Services/Teams/TeamsBase.php +++ b/tests/e2e/Services/Teams/TeamsBase.php @@ -17,7 +17,8 @@ trait TeamsBase 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ 'teamId' => 'unique()', - 'name' => 'Arsenal' + 'name' => 'Arsenal', + 'roles' => ['player'], ]); $this->assertEquals(201, $response1['headers']['status-code']); From 9333efd3c3ee0fd8e354b8fb4aedfb3ba1086a23 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Mon, 18 Jul 2022 21:41:11 +1200 Subject: [PATCH 3/4] Format --- app/controllers/api/teams.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 40388a8520..f0778802cb 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -70,7 +70,7 @@ App::post('/v1/teams') if (!\in_array('owner', $roles)) { $roles[] = 'owner'; } - + $membershipId = $dbForProject->getId(); $membership = new Document([ '$id' => $membershipId, From 1e95279fc07d4712ecc2d9cce2156c3f6f98e41c Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 27 Jul 2022 20:01:37 +1200 Subject: [PATCH 4/4] Fix role checks --- tests/e2e/Services/Teams/TeamsBaseClient.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php index bd9b9c1ae0..7ad1f56924 100644 --- a/tests/e2e/Services/Teams/TeamsBaseClient.php +++ b/tests/e2e/Services/Teams/TeamsBaseClient.php @@ -28,7 +28,8 @@ trait TeamsBaseClient $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']); $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']); $this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']); - $this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]); + $this->assertContains('owner', $response['body']['memberships'][0]['roles']); + $this->assertContains('player', $response['body']['memberships'][0]['roles']); $membershipId = $response['body']['memberships'][0]['$id']; @@ -45,7 +46,8 @@ trait TeamsBaseClient $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']); $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']); $this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']); - $this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]); + $this->assertContains('owner', $response['body']['memberships'][0]['roles']); + $this->assertContains('player', $response['body']['memberships'][0]['roles']); $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([ 'content-type' => 'application/json', @@ -60,7 +62,8 @@ trait TeamsBaseClient $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']); $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']); $this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']); - $this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]); + $this->assertContains('owner', $response['body']['memberships'][0]['roles']); + $this->assertContains('player', $response['body']['memberships'][0]['roles']); $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([ 'content-type' => 'application/json',