Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactors for client portal

This commit is contained in:
David Bomba 2025-04-04 11:47:03 +11:00
parent c1a3d0b15d
commit cd185d31b9
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/ContactLoginController.php
View File

@ -182,7 +182,7 @@ class ContactLoginController extends Controller
{ {
Auth::guard('contact')->logout(); Auth::guard('contact')->logout();
request()->session()->invalidate(); request()->session()->invalidate();
request()->session()->regenerate(); request()->session()->regenerate(true);
request()->session()->regenerateToken(); request()->session()->regenerateToken();
return redirect('/client/login'); return redirect('/client/login');

16
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -237,17 +237,21 @@ class InvitationController extends Controller
$contact->password = Hash::make($request->password); $contact->password = Hash::make($request->password);
$contact->save(); $contact->save();
$is_silent = session()->get('is_silent') ?? false;
$request->session()->invalidate(); $request->session()->invalidate();
request()->session()->regenerate(true);
request()->session()->regenerateToken();
auth()->guard('contact')->loginUsingId($contact->id, true); auth()->guard('contact')->loginUsingId($contact->id, true);
if (! $invitation->viewed_date) { if (! $invitation->viewed_date) {
$invitation->markViewed(); $invitation->markViewed();
if (! session()->get('is_silent')) { if (! $is_silent) {
event(new InvitationWasViewed($invitation->{$request->entity_type}, $invitation, $invitation->{$request->entity_type}->company, Ninja::eventVars())); event(new InvitationWasViewed($invitation->{$request->entity_type}, $invitation, $invitation->{$request->entity_type}->company, Ninja::eventVars()));
} }
if (! session()->get('is_silent')) { if (! $is_silent) {
$this->fireEntityViewedEvent($invitation, $request->entity_type); $this->fireEntityViewedEvent($invitation, $request->entity_type);
} }
} }
@ -268,6 +272,7 @@ class InvitationController extends Controller
} }
request()->session()->invalidate(); request()->session()->invalidate();
request()->session()->regenerate(true);
request()->session()->regenerateToken(); request()->session()->regenerateToken();
auth()->guard('contact')->loginUsingId($contact->id, true); auth()->guard('contact')->loginUsingId($contact->id, true);
@ -286,7 +291,10 @@ class InvitationController extends Controller
$invitation->contact->restore(); $invitation->contact->restore();
} }
$is_silent = session()->get('is_silent') ?? false;
request()->session()->invalidate(); request()->session()->invalidate();
request()->session()->regenerate(true);
request()->session()->regenerateToken(); request()->session()->regenerateToken();
auth()->guard('contact')->loginUsingId($invitation->contact->id, true); auth()->guard('contact')->loginUsingId($invitation->contact->id, true);
@ -295,14 +303,14 @@ class InvitationController extends Controller
if (! $invitation->viewed_date) { if (! $invitation->viewed_date) {
$invitation->markViewed(); $invitation->markViewed();
if (!session()->get('is_silent')) { if (! $is_silent) {
event(new InvitationWasViewed($invitation->invoice, $invitation, $invitation->invoice->company, Ninja::eventVars())); event(new InvitationWasViewed($invitation->invoice, $invitation, $invitation->invoice->company, Ninja::eventVars()));
$this->fireEntityViewedEvent($invitation, $invoice); $this->fireEntityViewedEvent($invitation, $invoice);
} }
} }
if (!session()->get('is_silent')) { if (! $is_silent) {
event(new ContactLoggedIn($invitation->contact, $invitation->contact->company, Ninja::eventVars())); event(new ContactLoggedIn($invitation->contact, $invitation->contact->company, Ninja::eventVars()));
} }

4
app/Http/Controllers/ClientPortal/SwitchCompanyController.php
View File

@ -29,7 +29,9 @@ class SwitchCompanyController extends Controller
auth()->guard('contact')->loginUsingId($client_contact->id, true); auth()->guard('contact')->loginUsingId($client_contact->id, true);
request()->session()->regenerate(); request()->session()->invalidate();
request()->session()->regenerate(true);
request()->session()->regenerateToken();
return redirect('/client/dashboard'); return redirect('/client/dashboard');
} }