Implement EnsureUserHasWorkspace Trait and Integrate into Controllers… (#741)

* Implement EnsureUserHasWorkspace Trait and Integrate into Controllers and Jobs

- Introduced the EnsureUserHasWorkspace trait to ensure users have at least one workspace when they are detached from a workspace.
- Integrated the trait into WorkspaceUserController to enforce workspace checks during user detachment.
- Updated RemoveWorkspaceGuests job to utilize the new trait for ensuring users have a workspace after detachment.
- Modified UserWorkspace model to call the ensureUserHasWorkspace method upon deletion, maintaining workspace integrity.

These changes enhance user management by ensuring that users always have a workspace, improving overall application stability.

* Add test

---------

Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
Chirag Chhatrala
2025-04-28 21:33:38 +05:30
committed by GitHub
parent ff1a4d17d8
commit f344764f52
5 changed files with 270 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Jobs\Billing\WorkspaceUsersUpdated;
use App\Models\UserInvite;
use App\Traits\EnsureUserHasWorkspace;
use Illuminate\Http\Request;
use App\Models\Workspace;
use App\Models\User;
@@ -11,6 +12,8 @@ use App\Service\WorkspaceHelper;
class WorkspaceUserController extends Controller
{
use EnsureUserHasWorkspace;
public function __construct()
{
$this->middleware('auth');
@@ -106,7 +109,9 @@ class WorkspaceUserController extends Controller
$workspace = Workspace::findOrFail($workspaceId);
$this->authorize('adminAction', $workspace);
$user = User::findOrFail($userId);
$workspace->users()->detach($userId);
$this->ensureUserHasWorkspace($user);
WorkspaceUsersUpdated::dispatch($workspace);
return $this->success([
@@ -119,7 +124,9 @@ class WorkspaceUserController extends Controller
$workspace = Workspace::findOrFail($workspaceId);
$this->authorize('view', $workspace);
$workspace->users()->detach($request->user()->id);
$user = $request->user();
$workspace->users()->detach($user->id);
$this->ensureUserHasWorkspace($user);
return $this->success([
'message' => 'You have left the workspace successfully.'