fix permissions

wri · May 6, 2024 · fd0257f · fd0257f
1 parent 0076676
commit fd0257f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 1 deletion.
diff --git a/app/Policies/V2/Nurseries/NurseryPolicy.php b/app/Policies/V2/Nurseries/NurseryPolicy.php
@@ -12,6 +12,10 @@ class NurseryPolicy extends Policy
 {
     public function read(?User $user, ?Nursery $nursey = null): bool
     {
+        if ($this->isAdmin($user)) {
+            return true;
+        }
+
         if ($user->can('framework-' . $nursey->framework_key)) {
             return true;
         }

diff --git a/app/Policies/V2/Nurseries/NurseryReportPolicy.php b/app/Policies/V2/Nurseries/NurseryReportPolicy.php
@@ -12,6 +12,10 @@ class NurseryReportPolicy extends Policy
 {
     public function read(?User $user, ?NurseryReport $report = null): bool
     {
+        if ($this->isAdmin($user)) {
+            return true;
+        }
+
         if ($user->can('framework-' . $report->framework_key)) {
             return true;
         }

diff --git a/app/Policies/V2/Projects/ProjectPolicy.php b/app/Policies/V2/Projects/ProjectPolicy.php
@@ -12,6 +12,10 @@ class ProjectPolicy extends Policy
 {
     public function read(?User $user, ?Project $project = null): bool
     {
+        if ($this->isAdmin($user)) {
+            return true;
+        }
+
         if ($user->can('framework-' . $project->framework_key)) {
             return true;
         }

diff --git a/app/Policies/V2/Projects/ProjectReportPolicy.php b/app/Policies/V2/Projects/ProjectReportPolicy.php
@@ -12,6 +12,10 @@ class ProjectReportPolicy extends Policy
 {
     public function read(?User $user, ?ProjectReport $report = null): bool
     {
+        if ($this->isAdmin($user)) {
+            return true;
+        }
+
         if ($user->can('framework-' . $report->framework_key)) {
             return true;
         }

diff --git a/app/Policies/V2/Sites/SitePolicy.php b/app/Policies/V2/Sites/SitePolicy.php
@@ -12,6 +12,10 @@ class SitePolicy extends Policy
 {
     public function read(?User $user, ?Site $site = null): bool
     {
+        if ($this->isAdmin($user)) {
+            return true;
+        }
+
         if ($user->can('framework-' . $site->framework_key)) {
             return true;
         }

diff --git a/app/Policies/V2/Sites/SiteReportPolicy.php b/app/Policies/V2/Sites/SiteReportPolicy.php
@@ -12,6 +12,10 @@ class SiteReportPolicy extends Policy
 {
     public function read(?User $user, ?SiteReport $report = null): bool
     {
+        if ($this->isAdmin($user)) {
+            return true;
+        }
+
         if ($user->can('framework-' . $report->framework_key)) {
             return true;
         }

diff --git a/app/Policies/V2/Tasks/TaskPolicy.php b/app/Policies/V2/Tasks/TaskPolicy.php
@@ -11,6 +11,10 @@ class TaskPolicy extends Policy
 {
     public function read(?User $user, ?Task $task = null): bool
     {
+        if ($this->isAdmin($user)) {
+            return true;
+        }
+
         if ($user->can('framework-' . $task->project->framework_key)) {
             return true;
         }
@@ -24,7 +28,7 @@ public function read(?User $user, ?Task $task = null): bool
 
     public function readAll(?User $user, ?Task $task = null): bool
     {
-        return $user->hasAnyPermission(['framework-terrafund', 'framework-ppc']);
+        return $user->hasAnyPermission(['framework-terrafund', 'framework-ppc']) || $this->isAdmin($user);
     }
 
     public function update(?User $user, ?Task $task = null): bool