Merge pull request 'Fixed permission management' (#10) from dev-4.5.2 into main

Reviewed-on: #10

app/Repositories/CostUnitRepository.php

@@ -66,34 +66,20 @@ class CostUnitRepository {
     }
 
     public function getCostUnitsByCriteria(array $criteria, bool $forDisplay = true, $disableAccessCheck = false) : array {
-        $tenant = app('tenant');
-
-        $canSeeAll = false;
         $user = Auth()->user();
 
         if ($disableAccessCheck) {
             $canSeeAll = true;
         } else {
-            if ($tenant->slug !== 'lv') {
-                if (
-                    new AuthCheckProvider()->isAdministrator() ||
-                    $user->user_role_local_group === UserRole::USER_ROLE_ADMIN
-                ) {
-                    $canSeeAll = true;
-                }
-            } else {
-                if (
-                    in_array($user->user_role_main, [UserRole::USER_ROLE_GROUP_LEADER, UserRole::USER_ROLE_ADMIN])
-                ) {
-                    $canSeeAll = true;
-                }
-            }
+            $canSeeAll = in_array(new AuthCheckProvider()->getUserRole(), [
+                UserRole::USER_ROLE_ADMIN, UserRole::USER_ROLE_GROUP_LEADER
+            ]);
         }
 
         $visibleCostUnits = [];
         /** @var CostUnit $costUnit */
         foreach (Costunit::where($criteria)->get() as $costUnit) {
-            if ($canSeeAll || $disableAccessCheck || $costUnit->treasurers()->where('user_id', $user->id)->exists() ) {
+            if ($canSeeAll || $costUnit->treasurers()->where('user_id', $user->id)->exists() ) {
                 if ($forDisplay) {
                     $visibleCostUnits[] = new CostUnitResource($costUnit)->toArray(request());
                 } else {

app/Repositories/EventRepository.php

@@ -77,38 +77,20 @@ class EventRepository {
     }
 
     public function getEventsByCriteria(array $criteria, $accessCheck = true) : array {
-        $tenant = app('tenant');
-
-        $canSeeAll = false;
         $user = Auth()->user();
 
         if (!$accessCheck) {
             $canSeeAll = true;
         } else {
-        if (
-            new AuthCheckProvider()->isAdministrator() ||
-            $user->user_role_local_group === UserRole::USER_ROLE_ADMIN
-        ) {
-                if (
-                    $user->user_role_main === UserRole::USER_ROLE_ADMIN ||
-                    in_array($user->user_role_local_group, [UserRole::USER_ROLE_GROUP_LEADER, UserRole::USER_ROLE_ADMIN])
-                ) {
-                    $canSeeAll = true;
-                }
-            } else {
-                if (
-                    in_array($user->user_role_main, [UserRole::USER_ROLE_GROUP_LEADER, UserRole::USER_ROLE_ADMIN])
-                ) {
-                    $canSeeAll = true;
-                }
-            }
+            $canSeeAll = in_array(new AuthCheckProvider()->getUserRole(), [
+                UserRole::USER_ROLE_ADMIN, UserRole::USER_ROLE_GROUP_LEADER
+            ]);
         }
 
         $visibleEvents = [];
         /** @var Event $event */
         foreach (Event::where($criteria)->orderBy('start_date')->get() as $event) {
-
-            if ($canSeeAll || !$accessCheck || $event->eventManagers()->where('user_id', $user->id)->exists()) {
+            if ($canSeeAll || $event->eventManagers()->where('user_id', $user->id)->exists()) {
                 $visibleEvents[] = $event;
             }
         }

app/Repositories/InvoiceRepository.php

@@ -6,6 +6,7 @@ use App\Enumerations\InvoiceStatus;
 use App\Enumerations\UserRole;
 use App\Models\CostUnit;
 use App\Models\Invoice;
+use App\Providers\AuthCheckProvider;
 use App\Resources\InvoiceResource;
 use App\ValueObjects\Amount;
 use Illuminate\Database\Eloquent\Collection;
@@ -83,19 +84,9 @@ class InvoiceRepository {
             return $invoice;
         }
 
-        $user = auth()->user();
-        if ($user->user_role_main === UserRole::USER_ROLE_ADMIN) {
-            return $invoice;
-        }
+        return in_array(new AuthCheckProvider()->getUserRole(), [
+            UserRole::USER_ROLE_ADMIN, UserRole::USER_ROLE_GROUP_LEADER
+        ]) ? $invoice : null;
 
-        if (app('tenant')->slug === 'lv' && $user->user_role_main === UserRole::USER_ROLE_GROUP_LEADER) {
-            return $invoice;
-        }
-
-        if (app('tenant')->slug !== 'lv' && $user->local_group === app('tenant')->slug && $user->user_role_local_group === UserRole::USER_ROLE_GROUP_LEADER) {
-            return $invoice;
-        }
-
-        return null;
     }
 }

version

@@ -1 +1 @@
-4.5.0
+4.5.2