dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor(invitation): rename methods for consistency and enhance invitation deletion logic

Browse Source
This commit is contained in:
Andras Bacsai
2025-06-25 11:45:55 +02:00
parent 38e947d704
commit 7fb85314e5
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Controller.php
View File

@@ -144,7 +144,7 @@ class Controller extends BaseController
} }
} }
public function revoke_invitation() public function revokeInvitation()
{ {
$invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail(); $invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail();
$user = User::whereEmail($invitation->email)->firstOrFail(); $user = User::whereEmail($invitation->email)->firstOrFail();

12
app/Livewire/Team/Invitations.php
View File

@@ -3,6 +3,7 @@
namespace App\Livewire\Team; namespace App\Livewire\Team;
use App\Models\TeamInvitation; use App\Models\TeamInvitation;
use App\Models\User;
use Livewire\Component; use Livewire\Component;
class Invitations extends Component class Invitations extends Component
@@ -14,8 +15,15 @@ class Invitations extends Component
public function deleteInvitation(int $invitation_id) public function deleteInvitation(int $invitation_id)
{ {
try { try {
$initiation_found = TeamInvitation::ownedByCurrentTeam()->findOrFail($invitation_id); $invitation = TeamInvitation::ownedByCurrentTeam()->findOrFail($invitation_id);
$initiation_found->delete(); $user = User::whereEmail($invitation->email)->firstOrFail();
$emailVerified = $user->hasVerifiedEmail();
$forcePasswordReset = $user->force_password_reset;
if ($emailVerified === false && $forcePasswordReset === true) {
$user->delete();
}
$invitation->delete();
$this->refreshInvitations(); $this->refreshInvitations();
$this->dispatch('success', 'Invitation revoked.'); $this->dispatch('success', 'Invitation revoked.');
} catch (\Exception) { } catch (\Exception) {

6
app/Livewire/Team/InviteLink.php
View File

@@ -29,15 +29,15 @@ class InviteLink extends Component
public function viaEmail() public function viaEmail()
{ {
$this->generate_invite_link(sendEmail: true); $this->generateInviteLink(sendEmail: true);
} }
public function viaLink() public function viaLink()
{ {
$this->generate_invite_link(sendEmail: false); $this->generateInviteLink(sendEmail: false);
} }
private function generate_invite_link(bool $sendEmail = false) private function generateInviteLink(bool $sendEmail = false)
{ {
try { try {
$this->validate(); $this->validate();

2
resources/views/livewire/tags/show.blade.php
View File

@@ -1,7 +1,7 @@
<div> <div>
<div class="flex items-start gap-2 pb-10"> <div class="flex items-start gap-2 pb-10">
<div> <div>
<h1>Tags</h1> <h1 class="pb-2">Tags</h1>
<div>Tags help you to perform actions on multiple resources.</div> <div>Tags help you to perform actions on multiple resources.</div>
</div> </div>
</div> </div>

4
resources/views/livewire/team/admin-view.blade.php
View File

@@ -18,8 +18,8 @@
<div class="flex items-center justify-center gap-2 mx-4 text-xs font-bold "> <div class="flex items-center justify-center gap-2 mx-4 text-xs font-bold ">
<x-modal-confirmation title="Confirm User Deletion?" buttonTitle="Delete" isErrorButton <x-modal-confirmation title="Confirm User Deletion?" buttonTitle="Delete" isErrorButton
submitAction="delete({{ $user->id }})" :actions="[ submitAction="delete({{ $user->id }})" :actions="[
'The selected user will be permanently deleted from Coolify and the database.', 'The selected user will be permanently deleted from Coolify\'s database.',
'All resources (application, databases, services, configurations, servers, private keys, tags, etc.) related to this user will be deleted from Coolify and from the server (if the server is reachable).', 'All resources (application, databases, services, configurations, servers, private keys, tags, etc.) related to this user\'s default team will be deleted from Coolify\'s database.',
]" ]"
confirmationText="{{ $user->name }}" confirmationText="{{ $user->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the User Name below" confirmationLabel="Please confirm the execution of the actions by entering the User Name below"

2
routes/web.php
View File

@@ -164,7 +164,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
Route::prefix('invitations')->group(function () { Route::prefix('invitations')->group(function () {
Route::get('/{uuid}', [Controller::class, 'acceptInvitation'])->name('team.invitation.accept'); Route::get('/{uuid}', [Controller::class, 'acceptInvitation'])->name('team.invitation.accept');
Route::get('/{uuid}/revoke', [Controller::class, 'revoke_invitation'])->name('team.invitation.revoke'); Route::get('/{uuid}/revoke', [Controller::class, 'revokeInvitation'])->name('team.invitation.revoke');
}); });
Route::get('/projects', ProjectIndex::class)->name('project.index'); Route::get('/projects', ProjectIndex::class)->name('project.index');