From b72dcdeeb45490b8cf84ccfb1d7c5ea85d7ee49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Tue, 13 Sep 2022 21:59:26 +0000 Subject: [PATCH] Revert unrelated changes --- src/Appwrite/Auth/Auth.php | 2 +- tests/unit/Auth/AuthTest.php | 12 ++++++------ tests/unit/Messaging/MessagingChannelsTest.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Appwrite/Auth/Auth.php b/src/Appwrite/Auth/Auth.php index cd26281090..c290d19862 100644 --- a/src/Appwrite/Auth/Auth.php +++ b/src/Appwrite/Auth/Auth.php @@ -433,7 +433,7 @@ class Auth if (isset($node['$id']) && isset($node['teamId'])) { $roles[] = Role::team($node['teamId'])->toString(); - $roles[] = Role::user($node['$id'])->toString(); + $roles[] = Role::member($node['$id'])->toString(); if (isset($node['roles'])) { foreach ($node['roles'] as $nodeRole) { // Set all team roles diff --git a/tests/unit/Auth/AuthTest.php b/tests/unit/Auth/AuthTest.php index 65200ecdab..1480fbb23f 100644 --- a/tests/unit/Auth/AuthTest.php +++ b/tests/unit/Auth/AuthTest.php @@ -382,8 +382,8 @@ class AuthTest extends TestCase $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles); - $this->assertContains(Role::user(ID::custom('456'))->toString(), $roles); - $this->assertContains(Role::user(ID::custom('abc'))->toString(), $roles); + $this->assertContains(Role::member(ID::custom('456'))->toString(), $roles); + $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles); } public function testPrivilegedUserRoles(): void @@ -422,8 +422,8 @@ class AuthTest extends TestCase $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles); - $this->assertContains(Role::user(ID::custom('def'))->toString(), $roles); - $this->assertContains(Role::user(ID::custom('abc'))->toString(), $roles); + $this->assertContains(Role::member(ID::custom('def'))->toString(), $roles); + $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles); } public function testAppUserRoles(): void @@ -462,7 +462,7 @@ class AuthTest extends TestCase $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles); - $this->assertContains(Role::user(ID::custom('def'))->toString(), $roles); - $this->assertContains(Role::user(ID::custom('abc'))->toString(), $roles); + $this->assertContains(Role::member(ID::custom('def'))->toString(), $roles); + $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles); } } diff --git a/tests/unit/Messaging/MessagingChannelsTest.php b/tests/unit/Messaging/MessagingChannelsTest.php index 58213aed5f..dd2ec04401 100644 --- a/tests/unit/Messaging/MessagingChannelsTest.php +++ b/tests/unit/Messaging/MessagingChannelsTest.php @@ -260,7 +260,7 @@ class MessagingChannelsTest extends TestCase for ($i = 0; $i < $this->connectionsPerChannel; $i++) { $permissions[] = Role::team(ID::custom('team' . $i))->toString(); - $permissions[] = Role::user(ID::custom('member' . $i))->toString(); + $permissions[] = Role::member(ID::custom('member' . $i))->toString(); } $event = [ 'project' => '1', @@ -292,7 +292,7 @@ class MessagingChannelsTest extends TestCase $permissions = [ Role::team(ID::custom('team' . $index), $role)->toString(), - Role::user(ID::custom('member' . $index))->toString() + Role::member(ID::custom('member' . $index))->toString() ]; $event = [