Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/Auth/Eloquent/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Hash;
use Statamic\Auth\PermissionCache;
use Statamic\Auth\User as BaseUser;
use Statamic\Contracts\Auth\Passkey;
use Statamic\Contracts\Auth\Role as RoleContract;
Expand Down Expand Up @@ -219,6 +220,12 @@ public function isInGroup($group)

public function permissions()
{
$cache = app(PermissionCache::class);

if ($cached = $cache->get($this->id())) {
return $cached;
}

$permissions = $this->groups()->flatMap->roles()
->merge($this->roles())
->flatMap->permissions();
Expand All @@ -227,6 +234,10 @@ public function permissions()
$permissions[] = 'super';
}

$permissions = $permissions->unique()->values();

$cache->put($this->id(), $permissions);

return $permissions;
}

Expand Down
60 changes: 60 additions & 0 deletions tests/Auth/Eloquent/EloquentUserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Statamic\Auth\Eloquent\WebAuthnModel;
use Statamic\Auth\File\Role;
use Statamic\Auth\File\UserGroup;
use Statamic\Auth\PermissionCache;
use Statamic\Auth\WebAuthn\Serializer;
use Statamic\Contracts\Auth\Role as RoleContract;
use Statamic\Contracts\Auth\UserGroup as UserGroupContract;
Expand Down Expand Up @@ -411,4 +412,63 @@ public function deserialize($data)
->all()
);
}

#[Test]
public function permissions_are_cached_after_first_call()
{
$role = Facades\Role::make('editor')->addPermission('access cp');
Facades\Role::shouldReceive('find')->with('editor')->andReturn($role);

$user = $this->createPermissible()->assignRole($role);
$user->save();

$cache = app(PermissionCache::class);

$this->assertNull($cache->get($user->id()));

$user->permissions();

$this->assertNotNull($cache->get($user->id()));
$this->assertTrue($cache->get($user->id())->contains('access cp'));
}

#[Test]
public function permissions_are_read_from_cache_on_subsequent_calls()
{
$role = Facades\Role::make('editor')->addPermission('access cp');
Facades\Role::shouldReceive('find')->with('editor')->andReturn($role);

$user = $this->createPermissible()->assignRole($role);
$user->save();

$cache = app(PermissionCache::class);

// Seed the cache with different data to prove subsequent calls use it
$cache->put($user->id(), collect(['cached-permission']));

$this->assertEquals(['cached-permission'], $user->permissions()->all());
$this->assertTrue($user->hasPermission('cached-permission'));
$this->assertFalse($user->hasPermission('access cp'));
}

#[Test]
public function permissions_cache_is_invalidated_when_cleared()
{
$role = Facades\Role::make('editor')->addPermission('access cp');
Facades\Role::shouldReceive('find')->with('editor')->andReturn($role);

$user = $this->createPermissible()->assignRole($role);
$user->save();

$cache = app(PermissionCache::class);

$user->permissions();
$this->assertNotNull($cache->get($user->id()));

$cache->clear();
$this->assertNull($cache->get($user->id()));

// Recomputes correctly after cache is cleared
$this->assertTrue($user->permissions()->contains('access cp'));
}
}
Loading