Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 01:14:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for logging in duplicate contact email addresses

Browse Source
This commit is contained in:
David Bomba 2022-01-18 11:24:40 +11:00
parent 3cf5ae9056
commit 2b80d3572a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Auth/ContactForgotPasswordController.php
View File

@ -100,10 +100,18 @@ class ContactForgotPasswordController extends Controller
if(Ninja::isHosted() && $company = Company::where('company_key', $request->input('company_key'))->first()) if(Ninja::isHosted() && $company = Company::where('company_key', $request->input('company_key'))->first())
{ {
$contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])->first(); $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])
->whereHas('client', function ($query) {
$query->where('is_deleted',0);
})->first();
}
else {
$contact = ClientContact::where(['email' => $request->input('email')])
->whereHas('client', function ($query) {
$query->where('is_deleted',0);
})->first();
} }
else
$contact = ClientContact::where(['email' => $request->input('email')])->first();
$response = false; $response = false;

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

@ -98,7 +98,10 @@ class ContactLoginController extends Controller
if(Ninja::isHosted() && $request->has('password') && $company = Company::where('company_key', $request->input('company_key'))->first()){ if(Ninja::isHosted() && $request->has('password') && $company = Company::where('company_key', $request->input('company_key'))->first()){
$contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])->first(); $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])
->whereHas('client', function ($query) {
$query->where('is_deleted',0);
})->first();
if(!$contact) if(!$contact)
return $this->sendFailedLoginResponse($request); return $this->sendFailedLoginResponse($request);