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 */
+        $this->authorize('update', $project);
-        $project = $request->user()->projects()->findOrFail($project->id);
 
         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();
         }

resources/views/components/toast.blade.php

@@ -432,7 +432,7 @@ class="-ml-1 mr-1.5 h-[18px] w-[18px]"
                                 ></path>
                             </svg>
                             <p
-                                class="text-[13px] font-medium leading-none text-gray-800 dark:text-white"
+                                class="font-medium leading-none text-gray-800 dark:text-white"
                                 x-text="toast.message"
                             ></p>
                         </div>

resources/views/settings/source-controls/partials/source-controls-list.blade.php

@@ -27,10 +27,13 @@
                     <div class="flex items-center">
                         <div class="inline">
                             <x-icon-button
+                                id="edit-{{ $sourceControl->id }}"
                                 hx-get="{{ route('settings.source-controls', ['edit' => $sourceControl->id]) }}"
                                 hx-replace-url="true"
                                 hx-select="#edit"
                                 hx-target="#edit"
+                                hx-ext="disable-element"
+                                hx-disable-element="#edit-{{ $sourceControl->id }}"
                             >
                                 <x-heroicon name="o-pencil" class="h-5 w-5" />
                             </x-icon-button>

routes/web.php

@@ -24,7 +24,7 @@
         require __DIR__.'/settings.php';
     });
 
-    Route::prefix('/servers')->group(function () {
+    Route::prefix('/servers')->middleware('must-have-current-project')->group(function () {
         require __DIR__.'/server.php';
     });
 

tests/Feature/UserTest.php

@@ -0,0 +1,161 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Enums\UserRole;
+use App\Models\Project;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class UserTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_user(): void
+    {
+        $this->actingAs($this->user);
+
+        $this->post(route('settings.users.store'), [
+            'name' => 'new user',
+            'email' => 'newuser@example.com',
+            'password' => 'password',
+            'role' => UserRole::USER,
+        ])->assertSessionDoesntHaveErrors();
+
+        $this->assertDatabaseHas('users', [
+            'name' => 'new user',
+            'email' => 'newuser@example.com',
+            'role' => UserRole::USER,
+        ]);
+    }
+
+    public function test_see_users_list(): void
+    {
+        $this->actingAs($this->user);
+
+        $user = User::factory()->create();
+
+        $this->get(route('settings.users.index'))
+            ->assertSuccessful()
+            ->assertSee($user->name);
+    }
+
+    public function test_must_be_admin_to_see_users_list(): void
+    {
+        $this->user->role = UserRole::USER;
+        $this->user->save();
+
+        $this->actingAs($this->user);
+
+        $user = User::factory()->create();
+
+        $this->get(route('settings.users.index'))
+            ->assertForbidden();
+    }
+
+    public function test_delete_user(): void
+    {
+        $this->actingAs($this->user);
+
+        $user = User::factory()->create();
+
+        $this->delete(route('settings.users.delete', $user))
+            ->assertSessionDoesntHaveErrors();
+
+        $this->assertDatabaseMissing('users', [
+            'id' => $user->id,
+        ]);
+    }
+
+    public function test_cannot_delete_yourself(): void
+    {
+        $this->actingAs($this->user);
+
+        $this->delete(route('settings.users.delete', $this->user))
+            ->assertSessionDoesntHaveErrors()
+            ->assertSessionHas('toast.type', 'error');
+
+        $this->assertDatabaseHas('users', [
+            'id' => $this->user->id,
+        ]);
+    }
+
+    public function test_see_user(): void
+    {
+        $this->actingAs($this->user);
+
+        $user = User::factory()->create();
+
+        $this->get(route('settings.users.show', $user))
+            ->assertSuccessful()
+            ->assertSee($user->name);
+    }
+
+    public function test_edit_user_info(): void
+    {
+        $this->actingAs($this->user);
+
+        $user = User::factory()->create();
+
+        $this->post(route('settings.users.update', $user), [
+            'name' => 'new-name',
+            'email' => 'newemail@example.com',
+            'timezone' => 'Europe/London',
+            'role' => UserRole::ADMIN,
+        ])
+            ->assertSessionDoesntHaveErrors();
+
+        $this->assertDatabaseHas('users', [
+            'id' => $user->id,
+            'name' => 'new-name',
+            'email' => 'newemail@example.com',
+            'timezone' => 'Europe/London',
+            'role' => UserRole::ADMIN,
+        ]);
+    }
+
+    public function test_edit_user_projects(): void
+    {
+        $this->actingAs($this->user);
+
+        $user = User::factory()->create();
+        $project = Project::factory()->create();
+
+        $this->post(route('settings.users.update-projects', $user), [
+            'projects' => [$project->id],
+        ])
+            ->assertSessionDoesntHaveErrors();
+
+        $this->assertDatabaseHas('user_project', [
+            'user_id' => $user->id,
+            'project_id' => $project->id,
+        ]);
+    }
+
+    public function test_edit_user_projects_with_current_project(): void
+    {
+        $this->actingAs($this->user);
+
+        $user = User::factory()->create();
+        $user->current_project_id = null;
+        $user->save();
+
+        $project = Project::factory()->create();
+
+        $this->post(route('settings.users.update-projects', $user), [
+            'projects' => [$project->id],
+        ])
+            ->assertSessionDoesntHaveErrors();
+
+        $this->assertDatabaseHas('user_project', [
+            'user_id' => $user->id,
+            'project_id' => $project->id,
+        ]);
+
+        $this->assertDatabaseHas('users', [
+            'id' => $user->id,
+            'current_project_id' => $project->id,
+        ]);
+    }
+}