1
0
Fork 0
mirror of synced 2024-07-02 13:10:38 +12:00

Revert unrelated changes

This commit is contained in:
Matej Bačo 2022-09-13 21:59:26 +00:00
parent 182db2b2e3
commit b72dcdeeb4
3 changed files with 9 additions and 9 deletions

View file

@ -433,7 +433,7 @@ class Auth
if (isset($node['$id']) && isset($node['teamId'])) { if (isset($node['$id']) && isset($node['teamId'])) {
$roles[] = Role::team($node['teamId'])->toString(); $roles[] = Role::team($node['teamId'])->toString();
$roles[] = Role::user($node['$id'])->toString(); $roles[] = Role::member($node['$id'])->toString();
if (isset($node['roles'])) { if (isset($node['roles'])) {
foreach ($node['roles'] as $nodeRole) { // Set all team roles foreach ($node['roles'] as $nodeRole) { // Set all team roles

View file

@ -382,8 +382,8 @@ class AuthTest extends TestCase
$this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles); $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'))->toString(), $roles);
$this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles);
$this->assertContains(Role::user(ID::custom('456'))->toString(), $roles); $this->assertContains(Role::member(ID::custom('456'))->toString(), $roles);
$this->assertContains(Role::user(ID::custom('abc'))->toString(), $roles); $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles);
} }
public function testPrivilegedUserRoles(): void 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('abc'), 'moderator')->toString(), $roles);
$this->assertContains(Role::team(ID::custom('def'))->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles);
$this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles);
$this->assertContains(Role::user(ID::custom('def'))->toString(), $roles); $this->assertContains(Role::member(ID::custom('def'))->toString(), $roles);
$this->assertContains(Role::user(ID::custom('abc'))->toString(), $roles); $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles);
} }
public function testAppUserRoles(): void 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('abc'), 'moderator')->toString(), $roles);
$this->assertContains(Role::team(ID::custom('def'))->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles);
$this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles); $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles);
$this->assertContains(Role::user(ID::custom('def'))->toString(), $roles); $this->assertContains(Role::member(ID::custom('def'))->toString(), $roles);
$this->assertContains(Role::user(ID::custom('abc'))->toString(), $roles); $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles);
} }
} }

View file

@ -260,7 +260,7 @@ class MessagingChannelsTest extends TestCase
for ($i = 0; $i < $this->connectionsPerChannel; $i++) { for ($i = 0; $i < $this->connectionsPerChannel; $i++) {
$permissions[] = Role::team(ID::custom('team' . $i))->toString(); $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 = [ $event = [
'project' => '1', 'project' => '1',
@ -292,7 +292,7 @@ class MessagingChannelsTest extends TestCase
$permissions = [ $permissions = [
Role::team(ID::custom('team' . $index), $role)->toString(), Role::team(ID::custom('team' . $index), $role)->toString(),
Role::user(ID::custom('member' . $index))->toString() Role::member(ID::custom('member' . $index))->toString()
]; ];
$event = [ $event = [