fix

code4romania · Oct 20, 2023 · 319455a · 319455a
1 parent cc7e129
commit 319455a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/Http/Controllers/OrganizationController.php b/app/Http/Controllers/OrganizationController.php
@@ -43,7 +43,14 @@ public function index(Request $request)
 
     public function show(Organization $organization)
     {
-        $this->authorize('view', $organization);
+        if (!$organization->isActive()) {
+            if (!auth()->check() ) {
+                abort(404);
+            }
+            if (!auth()->user()->belongsToOrganization($organization)) {
+                abort(404);
+            }
+        }
 
         return Inertia::render('Public/Organizations/Show', [
             'organization' => new ShowOrganizationResource(

diff --git a/app/Policies/OrganizationPolicy.php b/app/Policies/OrganizationPolicy.php
@@ -4,7 +4,6 @@
 
 namespace App\Policies;
 
-use App\Enums\OrganizationStatus;
 use App\Models\Organization;
 use App\Models\User;
 
@@ -25,11 +24,7 @@ public function viewAny(User $user): bool
     public function view(User $user, Organization $organization): bool
     {
         /* Anyone can see the details of an organization. */
-        if ($organization->isActive())
-        {
-            return true;
-        }
-        return $user->isSuperUser() || $user->isOrganizationAdmin($organization);
+        return true;
     }
 
     /**