fix new user bug (#197)

app/Http/Controllers/Settings/ProjectController.php

@@ -19,6 +19,8 @@ class ProjectController extends Controller
 {
     public function index(): View
     {
+        $this->authorize('viewAny', Project::class);
+
         return view('settings.projects.index', [
             'projects' => Project::all(),
         ]);
@@ -26,6 +28,8 @@ public function index(): View
 
     public function create(Request $request): HtmxResponse
     {
+        $this->authorize('create', Project::class);
+
         app(CreateProject::class)->create($request->user(), $request->input());
 
         Toast::success('Project created.');
@@ -35,8 +39,7 @@ public function create(Request $request): HtmxResponse
 
     public function update(Request $request, Project $project): HtmxResponse
     {
-        /** @var Project $project */
-        $project = $request->user()->projects()->findOrFail($project->id);
+        $this->authorize('update', $project);
 
         app(UpdateProject::class)->update($project, $request->input());
 
@@ -47,6 +50,8 @@ public function update(Request $request, Project $project): HtmxResponse
 
     public function delete(Project $project): RedirectResponse
     {
+        $this->authorize('delete', $project);
+
         /** @var User $user */
         $user = auth()->user();
 

app/Http/Controllers/Settings/UserController.php

@@ -7,6 +7,7 @@
 use App\Facades\Toast;
 use App\Helpers\HtmxResponse;
 use App\Http\Controllers\Controller;
+use App\Models\Project;
 use App\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
@@ -56,6 +57,18 @@ public function updateProjects(User $user, Request $request): HtmxResponse
 
         $user->projects()->sync($request->projects);
 
+        if ($user->currentProject && ! $user->projects->contains($user->currentProject)) {
+            $user->current_project_id = null;
+            $user->save();
+        }
+
+        /** @var Project $firstProject */
+        $firstProject = $user->projects->first();
+        if (! $user->currentProject && $firstProject) {
+            $user->current_project_id = $firstProject->id;
+            $user->save();
+        }
+
         Toast::success('Projects updated successfully');
 
         return htmx()->redirect(route('settings.users.show', $user));

app/Http/Kernel.php

@@ -69,5 +69,6 @@ class Kernel extends HttpKernel
         'handle-ssh-errors' => HandleSSHErrors::class,
         'select-current-project' => SelectCurrentProject::class,
         'is-admin' => \App\Http\Middleware\IsAdmin::class,
+        'must-have-current-project' => \App\Http\Middleware\MustHaveCurrentProject::class,
     ];
 }

app/Http/Middleware/MustHaveCurrentProject.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Facades\Toast;
+use App\Models\User;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class MustHaveCurrentProject
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        if (! $user->currentProject) {
+            Toast::warning('Please select a project to continue');
+
+            return redirect()->route('profile');
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/SelectCurrentProject.php

@@ -22,7 +22,7 @@ public function handle(Request $request, Closure $next): Response
         /** @var User $user */
         $user = $request->user();
 
-        if ($server->project_id != $user->current_project_id) {
+        if ($server->project_id != $user->current_project_id && $user->can('view', $server)) {
             $user->current_project_id = $server->project_id;
             $user->save();
         }