adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 04:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed permissions; Added tests for permission store

Browse Source
This commit is contained in:
Constantin Graf
2024-04-24 15:07:39 +02:00
committed by Constantin Graf
parent 75a3404f46
commit 267adf52ca
6 changed files with 170 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Middleware/ShareInertiaData.php
View File

@@ -24,9 +24,10 @@ class ShareInertiaData
*/
public function handle(Request $request, Closure $next): Response
{
/** @var PermissionStore $permissions */
$permissions = app(PermissionStore::class);
Inertia::share(array_filter([
'permissions' => $request->user() !== null ? $permissions->permissions($request->user()->currentTeam) : [],
'permissions' => $request->user() !== null && $request->user()->currentTeam !== null ? $permissions->getPermissions($request->user()->currentTeam) : [],
'jetstream' => function () use ($request) {
/** @var User|null $user */
$user = $request->user();

33
app/Service/PermissionStore.php
View File

@@ -17,6 +17,11 @@ class PermissionStore
*/
private array $permissionCache = [];
public function clear(): void
{
$this->permissionCache = [];
}
public function has(Organization $organization, string $permission): bool
{
/** @var User|null $user */
@@ -26,15 +31,11 @@ class PermissionStore
}
if (! isset($this->permissionCache[$user->getKey().'|'.$organization->getKey()])) {
if ($user->ownsTeam($organization)) {
return true;
}
if (! $user->belongsToTeam($organization)) {
return false;
}
$permissions = $user->teamPermissions($organization);
$permissions = $this->getPermissionsByUser($organization, $user);
$this->permissionCache[$user->getKey().'|'.$organization->getKey()] = $permissions;
} else {
$permissions = $this->permissionCache[$user->getKey().'|'.$organization->getKey()];
@@ -46,14 +47,8 @@ class PermissionStore
/**
* @return array<string>
*/
public function getPermissions(Organization $organization): array
private function getPermissionsByUser(Organization $organization, User $user): array
{
/** @var User|null $user */
$user = Auth::user();
if ($user === null) {
return [];
}
if (! $user->belongsToTeam($organization)) {
return [];
}
@@ -69,4 +64,18 @@ class PermissionStore
return $role !== null ? ($roleObj?->permissions ?? []) : [];
}
/**
* @return array<string>
*/
public function getPermissions(Organization $organization): array
{
/** @var User|null $user */
$user = Auth::user();
if ($user === null) {
return [];
}
return $this->getPermissionsByUser($organization, $user);
}
}