Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Login contacts using their ID - allows us to login contacts with the same email address

Browse Source
This commit is contained in:
David Bomba 2021-12-08 08:45:24 +11:00
parent 9981a4c789
commit cd41ce4ceb
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ class ContactLoginController extends Controller
public function authenticated(Request $request, ClientContact $client) public function authenticated(Request $request, ClientContact $client)
{ {
Auth::guard('contact')->login($client, true); Auth::guard('contact')->loginUsingId($client->id, true);
event(new ContactLoggedIn($client, $client->company, Ninja::eventVars())); event(new ContactLoggedIn($client, $client->company, Ninja::eventVars()));

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

@ -43,7 +43,7 @@ class ContactRegisterController extends Controller
$client = $this->getClient($request->all()); $client = $this->getClient($request->all());
$client_contact = $this->getClientContact($request->all(), $client); $client_contact = $this->getClientContact($request->all(), $client);
Auth::guard('contact')->login($client_contact, true); Auth::guard('contact')->loginUsingId($client_contact->id, true);
return redirect()->route('client.dashboard'); return redirect()->route('client.dashboard');
} }

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

@ -94,7 +94,7 @@ class InvitationController extends Controller
$client_contact->email = Str::random(15) . "@example.com"; $client_contact->save(); $client_contact->email = Str::random(15) . "@example.com"; $client_contact->save();
if (request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) { if (request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) {
auth()->guard('contact')->login($client_contact, true); auth()->guard('contact')->loginUsingId($client_contact->id, true);
} elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) { } elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) {
$this->middleware('auth:contact'); $this->middleware('auth:contact');
@ -102,7 +102,7 @@ class InvitationController extends Controller
} else { } else {
nlog("else - default - login contact"); nlog("else - default - login contact");
auth()->guard('contact')->login($client_contact, true); auth()->guard('contact')->loginUsingId($client_contact->id, true);
} }
@ -201,7 +201,7 @@ class InvitationController extends Controller
if($payment->client_id != $contact->client_id) if($payment->client_id != $contact->client_id)
abort(403, 'You are not authorized to view this resource'); abort(403, 'You are not authorized to view this resource');
auth()->guard('contact')->login($contact, true); auth()->guard('contact')->loginUsingId($contact->id, true);
return redirect()->route('client.payments.show', $payment->hashed_id); return redirect()->route('client.payments.show', $payment->hashed_id);
@ -213,7 +213,7 @@ class InvitationController extends Controller
->with('contact.client') ->with('contact.client')
->firstOrFail(); ->firstOrFail();
auth()->guard('contact')->login($invitation->contact, true); auth()->guard('contact')->loginUsingId($invitation->contact->id, true);
$invoice = $invitation->invoice; $invoice = $invitation->invoice;

2
app/Http/Controllers/ClientPortal/NinjaPlanController.php
View File

@ -50,7 +50,7 @@ class NinjaPlanController extends Controller
nlog("Ninja Plan Controller - Found and set Client Contact"); nlog("Ninja Plan Controller - Found and set Client Contact");
Auth::guard('contact')->login($client_contact,true); Auth::guard('contact')->loginUsingId($client_contact->id,true);
// /* Current paid users get pushed straight to subscription overview page*/ // /* Current paid users get pushed straight to subscription overview page*/
// if($account->isPaidHostedClient()) // if($account->isPaidHostedClient())

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

@ -27,7 +27,7 @@ class SwitchCompanyController extends Controller
->where('id', $this->transformKeys($contact)) ->where('id', $this->transformKeys($contact))
->first(); ->first();
auth()->guard('contact')->login($client_contact, true); auth()->guard('contact')->loginUsingId($client_contact->id, true);
return redirect('/client/dashboard'); return redirect('/client/dashboard');
} }

2
app/Http/Livewire/BillingPortalPurchase.php
View File

@ -285,7 +285,7 @@ class BillingPortalPurchase extends Component
*/ */
protected function getPaymentMethods(ClientContact $contact): self protected function getPaymentMethods(ClientContact $contact): self
{ {
Auth::guard('contact')->login($contact, true); Auth::guard('contact')->loginUsingId($contact->id, true);
$this->contact = $contact; $this->contact = $contact;

2
app/Http/Middleware/CheckClientExistence.php
View File

@ -52,7 +52,7 @@ class CheckClientExistence
} }
if (count($multiple_contacts) == 1) { if (count($multiple_contacts) == 1) {
Auth::guard('contact')->login($multiple_contacts[0], true); Auth::guard('contact')->loginUsingId($multiple_contacts[0]->id, true);
} }
session()->put('multiple_contacts', $multiple_contacts); session()->put('multiple_contacts', $multiple_contacts);

10
app/Http/Middleware/ContactKeyLogin.php
View File

@ -52,7 +52,7 @@ class ContactKeyLogin
if(empty($client_contact->email)) if(empty($client_contact->email))
$client_contact->email = Str::random(15) . "@example.com"; $client_contact->save(); $client_contact->email = Str::random(15) . "@example.com"; $client_contact->save();
auth()->guard('contact')->login($client_contact, true); auth()->guard('contact')->loginUsingId($client_contact->id, true);
if ($request->query('redirect') && !empty($request->query('redirect'))) { if ($request->query('redirect') && !empty($request->query('redirect'))) {
return redirect()->to($request->query('redirect')); return redirect()->to($request->query('redirect'));
@ -70,7 +70,7 @@ class ContactKeyLogin
if(empty($client_contact->email)) if(empty($client_contact->email))
$client_contact->email = Str::random(6) . "@example.com"; $client_contact->save(); $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
auth()->guard('contact')->login($client_contact, true); auth()->guard('contact')->loginUsingId($client_contact->id, true);
if ($request->query('next')) { if ($request->query('next')) {
return redirect()->to($request->query('next')); return redirect()->to($request->query('next'));
@ -86,7 +86,7 @@ class ContactKeyLogin
$client_contact->email = Str::random(6) . "@example.com"; $client_contact->save(); $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
} }
auth()->guard('contact')->login($client_contact, true); auth()->guard('contact')->loginUsingId($client_contact->id, true);
if ($request->query('next')) { if ($request->query('next')) {
return redirect($request->query('next')); return redirect($request->query('next'));
@ -104,7 +104,7 @@ class ContactKeyLogin
if(empty($primary_contact->email)) if(empty($primary_contact->email))
$primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save(); $primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save();
auth()->guard('contact')->login($primary_contact, true); auth()->guard('contact')->loginUsingId($primary_contact->id, true);
return redirect()->to('client/dashboard'); return redirect()->to('client/dashboard');
} }
} }
@ -116,7 +116,7 @@ class ContactKeyLogin
if(empty($primary_contact->email)) if(empty($primary_contact->email))
$primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save(); $primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save();
auth()->guard('contact')->login($primary_contact, true); auth()->guard('contact')->loginUsingId($primary_contact->id, true);
return redirect()->to('client/dashboard'); return redirect()->to('client/dashboard');
} }

2
app/Http/Middleware/ContactTokenAuth.php
View File

@ -51,7 +51,7 @@ class ContactTokenAuth
} }
//stateless, don't remember the contact. //stateless, don't remember the contact.
auth()->guard('contact')->login($client_contact, false); auth()->guard('contact')->loginUsingId($client_contact->id, false);
event(new ContactLoggedIn($client_contact, $client_contact->company, Ninja::eventVars())); event(new ContactLoggedIn($client_contact, $client_contact->company, Ninja::eventVars()));
} else { } else {