Restrict access to non-public profiles

app/Http/Controllers/ProfilesApiController.php

@@ -18,16 +18,17 @@ public function __construct()
         // Set the response Cache-Control headers
         $this->middleware('cache.headers:' . config('app.api_cache_control'));
 
+        $this->middleware('can:view,profile')->only('show');
         // CORS middleware is auto-applied to all API routes
     }
 
     /**
-     * Get a listing of all Profiles.
+     * Get a listing of all public Profiles.
      */
     public function index(ProfilesApiRequest $request): JsonResponse
     {
         return Cache::tags(['profiles', 'profile_data', 'profile_tags'])->remember($request->fullUrl(), 3600, function() use ($request) {
-            $profile = Profile::select(Profile::apiAttributes())->with(['media']);
+            $profile = Profile::select(Profile::apiAttributes())->with(['media'])->public();
 
             if ($request->filled('person')) {
                 $profile = $profile->whereIn('slug', explode(';', $request->person));
@@ -53,14 +54,6 @@ public function index(ProfilesApiRequest $request): JsonResponse
                 $profile = $profile->withAnyTags(explode(';', $request->tag), Profile::class);
             }
 
-            if ($request->filled('public')) {
-                if ($request->boolean('public')) {
-                    $profile = $profile->public();
-                } elseif ((bool)$request->input('public') === false) {
-                    $profile = $profile->private();
-                }
-            }
-
             if ($request->boolean('with_data')) {
                 if(count(array_filter($request->query())) <=1){
                     return response()->json(['error' => 'Please use a filter when pulling data.'], 400);

app/Http/Controllers/ProfilesController.php

@@ -44,6 +44,8 @@ public function __construct()
             'updateImage',
         ]);
 
+        $this->middleware('can:view,profile')->only('show');
+
         $this->middleware('can:export,profile')->only('pdfExport');
 
         $this->middleware('can.create.profile')->only('create');

app/Policies/ProfilePolicy.php

@@ -78,9 +78,17 @@ public function viewAdminIndex(User $user)
      * @param  \App\Profile  $profile
      * @return mixed
      */
-    public function view(User $user, Profile $profile)
+    public function view(?User $user, Profile $profile)
     {
-        return true;
+        if (request()->is('api/*')) {
+            return $profile->public;
+        }
+
+        return $profile->public ||
+                $user->hasRole(['site_admin', 'profiles_editor']) ||
+                $user->owns($profile, true) ||
+                $this->checkSchoolEditor($user, $profile) ||
+                $this->checkDepartmentEditor($user, $profile);
     }
 
     /**

resources/views/profiles/edit/information.blade.php

@@ -313,7 +313,7 @@ class="border-left ml-3"
 					</div>
 				</div>
 				<div class="col col-12 col-xl-5">
-					<p class="text-muted">Make profile viewable and searchable by website visitors. (If turned off, it will still be accessible via the public API and to site administrators.)</p>
+					<p class="text-muted">Make profile viewable and searchable by website visitors. If turned off, it will still be accessible to site administrators.</p>
 				</div>
 			</fieldset>
 			{!! Form::submit('Save', array('class' => 'btn btn-primary edit-button')) !!}